summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-29 19:22:26 -0400
committerOz Linden <oz@lindenlab.com>2011-03-29 19:22:26 -0400
commitb595bbcf2af03b2a285c2df450379b670bddbfbc (patch)
tree121ab3e96f6e72d53c5a4f84d761f13e1996bbda /.hgtags
parentfbd241da54ad6017825b59c5b0c71086d8b8957a (diff)
parent7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (diff)
merge changes for storm-1019
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags8
1 files changed, 8 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f970edf51a..2f6fd6e0e7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -81,3 +81,11 @@ f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
4e9eec6a347f89b2b3f295beb72f1cf7837dff66 2.6.0-start
9283d6d1d7eb71dfe4c330e7c9144857e7356bde 2.6.0-beta1
9283d6d1d7eb71dfe4c330e7c9144857e7356bde DRTVWR-40_2.6.0-beta1
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-start
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 DRTVWR-43_2.6.1-beta1
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1
+9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2
+9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2
+56b2778c743c2a964d82e1caf11084d76a87de2c 2.6.2-start
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 DRTVWR-43_2.6.1-beta1
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1