summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-19 18:56:28 -0400
committerOz Linden <oz@lindenlab.com>2011-03-19 18:56:28 -0400
commitf122d0939060fd597820a71d85a5c0d839bcff5d (patch)
tree960e91a3c8d3b7d9230ffabe572381676dca644a /.hgtags
parent2903ed47b8d3e4916000b1b8d4aefb67c11b1798 (diff)
parent1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff)
pull STORM-1089 beta fixes back to development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 419aae0475..f970edf51a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -77,5 +77,7 @@ b53a0576eec80614d7767ed72b40ed67aeff27c9 DRTVWR-38_2.5.2-release
b53a0576eec80614d7767ed72b40ed67aeff27c9 2.5.2-release
92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start
f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
+f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
+4e9eec6a347f89b2b3f295beb72f1cf7837dff66 2.6.0-start
9283d6d1d7eb71dfe4c330e7c9144857e7356bde 2.6.0-beta1
9283d6d1d7eb71dfe4c330e7c9144857e7356bde DRTVWR-40_2.6.0-beta1