summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-01-23 14:09:15 -0500
committerOz Linden <oz@lindenlab.com>2012-01-23 14:09:15 -0500
commitc3fa42e26c0dcdc4f39cf2d555f0052f4be8af43 (patch)
treee241ed0af12ccf87d5eb826f33f9371c30d0314c
parentb25ba94f05f8a79c7c584a2b18f85e7af9ae127f (diff)
parentb3b6c7bae1dada08e5d27f08580f6884de45fa97 (diff)
merge back tags from pre-release branch
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index ca76d5d4df..b42dfd32c7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -247,4 +247,6 @@ bd6bcde2584491fd9228f1fa51c4575f4e764e19 3.2.4-release
c6175c955a19e9b9353d242889ec1779b5762522 DRTVWR-105_3.2.5-release
c6175c955a19e9b9353d242889ec1779b5762522 3.2.5-release
2174ed1c7129562428a5cfe8651ed77b8d26ae18 3.2.6-start
+286d73ff5c19f6c00e023dc1b60975ed6bbe2872 DRTVWR-109_3.2.6-beta1
4891c46a56fed7512c783b9cbe7cb7260727bf0c 3.2.7-start
+286d73ff5c19f6c00e023dc1b60975ed6bbe2872 3.2.6-beta1