summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 07:00:20 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 07:00:20 -0400
commitd3023153e9c7aa2eaf18468e8d81aebf0d6223e0 (patch)
treef1265d15e702f1dd449476fd5e7b956ccd7f33f8 /.hgtags
parent7766d424d0f8cf8a6c882f50bc4dd04bf8f2096b (diff)
parentcb47ae3264f3d9d22add17f2cbc5699c8620705f (diff)
merge changes for storm-1035
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags8
1 files changed, 8 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index b03a498208..f970edf51a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -73,3 +73,11 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start
4dede9ae1ec74d41f6887719f6f1de7340d8578d 2.5.1-release
4dede9ae1ec74d41f6887719f6f1de7340d8578d DRTVWR-37_2.5.1-release
+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