summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:41:34 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:41:34 -0400
commitfe99404803c0582f845d0d42c0908b96cd6682fb (patch)
tree670291989177f3b408c376f01ab70859751fca04 /.hgtags
parenta84c8e0704e363a9b24f3ee56760178267086793 (diff)
parent0c05c8c89632d2747ca8b364ff663d1d5505fb4d (diff)
merge changes for storm-1118
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 80f6bd60fd..f5e5ea5ed0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -90,6 +90,8 @@ c5bdef3aaa2744626aef3c217ce29e1900d357b3 DRTVWR-43_2.6.1-beta1
c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1
9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2
9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2
+c9182ed77d427c759cfacf49a7b71a2e20d522aa DRTVWR-42_2.6.1-release
+c9182ed77d427c759cfacf49a7b71a2e20d522aa 2.6.1-release
56b2778c743c2a964d82e1caf11084d76a87de2c 2.6.2-start
42f32494bac475d0737799346f6831558ae8bf5d DRTVWR-39_2.6.0-release
42f32494bac475d0737799346f6831558ae8bf5d 2.6.0-release
@@ -97,3 +99,5 @@ d1203046bb653b763f835b04d184646949d8dd5c DRTVWR-45_2.6.2-beta1
d1203046bb653b763f835b04d184646949d8dd5c 2.6.2-beta1
52b2263ab28f0976c689fd0b76c55a9eb027cdbf end-of-develop.py
ec32f1045e7c2644015245df3a9933620aa194b8 2.6.3-start
+d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc DRTVWR-47_2.6.3-beta1
+d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc 2.6.3-beta1