summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-15 11:40:20 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-15 11:40:20 -0400
commitab6c5cbad4e29a6210ec2a19294d892b5146463b (patch)
treeed86a9c871124ba494aec19ff4c9dd15be18d4ec
parent27d34b5707934438e2363b5e8702bbbaedb3e2b6 (diff)
parent2c0f97ea392e770cc459b7b7974e9adad2249c87 (diff)
Automated merge up from viewer-development into mesh-development
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f122124a39..4bb6691a4d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -75,3 +75,5 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start
4dede9ae1ec74d41f6887719f6f1de7340d8578d 2.5.1-release
4dede9ae1ec74d41f6887719f6f1de7340d8578d DRTVWR-37_2.5.1-release
+b53a0576eec80614d7767ed72b40ed67aeff27c9 DRTVWR-38_2.5.2-release
+b53a0576eec80614d7767ed72b40ed67aeff27c9 2.5.2-release