summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-07 09:35:57 -0800
committerDave SIMmONs <simon@lindenlab.com>2011-03-07 09:35:57 -0800
commitfa4986e9781651626a6a467057509d653d98cf40 (patch)
tree8ac6428b1aa0ad79e3ea52c9734d8202f169988b /.hgtags
parentd413799644b8e7fa943fa86c7798634a28ce335d (diff)
parent5cb2d63979f0ff72cb9351dc9aa070b1990a1f9c (diff)
Merge latest from lindenlab/viewer-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 6eb0813d1b..8fa56c75b7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -70,3 +70,4 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-34_2.5.0-beta3
b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release
b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start
+63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start