summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-14 09:57:32 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-14 09:57:32 -0500
commit547293305bdc6c345f52519db514bb5be34c72ef (patch)
tree91eeb740686d9f6b644df91175023183d19412c4 /.hgtags
parenta761351396d81c4de7598340c61bf9cd4115071f (diff)
parente15b543dd655e2b93d9cab1326b389b6b04a7522 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 48aa4d2ad3..1087bc7208 100644
--- a/.hgtags
+++ b/.hgtags
@@ -69,3 +69,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