summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
committerOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
commit77dc594e79118769087c0e2094c303fc5aaea5d4 (patch)
treeed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /.hgtags
parent94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff)
parent1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff)
merge back late changes and tags from release branch
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags6
1 files changed, 6 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index ce40e797f8..78ab817de1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -198,3 +198,9 @@ b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start
c7282e59f374ee904bd793c3c444455e3399b0c5 3.1.0-start
2657fa785bbfac115852c41bd0adaff74c2ad5da DRTVWR-93_3.1.0-beta1
2657fa785bbfac115852c41bd0adaff74c2ad5da 3.1.0-beta1
+dbaaef19266478a20654c46395300640163e98e3 DRTVWR-96_3.1.0-beta2
+dbaaef19266478a20654c46395300640163e98e3 3.1.0-beta2
+dbaaef19266478a20654c46395300640163e98e3 DRTVWR-96_3.1.0-beta2
+bc01ee26fd0f1866e266429e85f76340523e91f1 DRTVWR-96_3.1.0-beta2
+dbaaef19266478a20654c46395300640163e98e3 3.1.0-beta2
+bc01ee26fd0f1866e266429e85f76340523e91f1 3.1.0-beta2