summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorcallum <none@none>2011-03-09 15:34:43 -0800
committercallum <none@none>2011-03-09 15:34:43 -0800
commitaac70bccada903098bd5a5074d7c4e347ddbef03 (patch)
tree66d7626379646f2eb385566e5d5098e95ebb3cd2 /.hgtags
parent90c824d10dbf4468dfdd9ffebf7456f81964391a (diff)
parent0c02401498521f87d38778df0e795960aa5445e1 (diff)
Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798)
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