summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-15 09:26:38 -0400
committerOz Linden <oz@lindenlab.com>2011-03-15 09:26:38 -0400
commitae3e97024ec60d2c0555bf01ff6e2786232b6dd5 (patch)
treec3469e40b8ae0edc3b8695a346942d3897666115 /.hgtags
parent845405cce6e432c60f1733e7b8d529682a107a86 (diff)
parent2c0f97ea392e770cc459b7b7974e9adad2249c87 (diff)
merge changes for storm-1021
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags3
1 files changed, 3 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 98e4c76757..812f1deff2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -72,3 +72,6 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start
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