summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 14:49:03 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 14:49:03 -0400
commit17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (patch)
treed57dc022d32f0a5c362860add8c697cddbd6842e /.hgtags
parenta024493c04aea26b523d52971ab9cc1c9df5d08b (diff)
parentd27a695b0be6c16e11a8c06c23d59e4107523ef6 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 812f1deff2..8d5f290ff6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -75,3 +75,7 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-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