summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-29 16:00:39 -0400
committerOz Linden <oz@lindenlab.com>2011-03-29 16:00:39 -0400
commit810a14c18fe869a3d882453a5367b49c27897ae6 (patch)
treec5d7b2a3fb3a8a3647f59d018ec665b634458216 /.hgtags
parentc2f34934e85779616fe129970831f31e0fb99348 (diff)
parenta7b83e04eba6e185625c783bd5210980572e9199 (diff)
merge changes for storm-1097
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags5
1 files changed, 5 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 04b353036a..b8c009f4d6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -82,3 +82,8 @@ f1827b441e05bf37c68e2c15ebc6d09e9b03f527 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