summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-01-23 14:06:56 -0500
committerOz Linden <oz@lindenlab.com>2012-01-23 14:06:56 -0500
commitb25ba94f05f8a79c7c584a2b18f85e7af9ae127f (patch)
tree1e4628f033ff00d303e840bd266f26fa52a72e31
parent64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff)
parentcd64ae7fb8ee781a5bf9ac47dd2428e659b939c9 (diff)
merge back tags from release branch
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 75dc28b262..ca76d5d4df 100644
--- a/.hgtags
+++ b/.hgtags
@@ -244,5 +244,7 @@ bd6bcde2584491fd9228f1fa51c4575f4e764e19 3.2.4-release
3d2d5d244c6398a4214c666d5dd3965b0918709a 3.2.5-beta1
65a2c1c8d855b88edfbea4e16ef2f27e7cff8b1d DRTVWR-107_3.2.5-beta2
65a2c1c8d855b88edfbea4e16ef2f27e7cff8b1d 3.2.5-beta2
+c6175c955a19e9b9353d242889ec1779b5762522 DRTVWR-105_3.2.5-release
+c6175c955a19e9b9353d242889ec1779b5762522 3.2.5-release
2174ed1c7129562428a5cfe8651ed77b8d26ae18 3.2.6-start
4891c46a56fed7512c783b9cbe7cb7260727bf0c 3.2.7-start