summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-11 12:54:12 -0500
committerOz Linden <oz@lindenlab.com>2011-02-11 12:54:12 -0500
commitee2aebfaf38ca12574b9835340ed8c55c6fbccf2 (patch)
treea03a005363255f6c3a6219d629499534bd25a370 /.hgtags
parent111e915a91ff5431d215312c8659518f5f149555 (diff)
parent924be3f25c2fca57a8d6f5f902eaeca5c2dd91e1 (diff)
merge up to lastest upstream
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index d177b462fd..08116f2a25 100644
--- a/.hgtags
+++ b/.hgtags
@@ -67,3 +67,5 @@ db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2
54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f DRTVWR-33_2.5.0-beta2
b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-beta3
b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-34_2.5.0-beta3
+b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release
+b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release