summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-20 22:51:11 -0400
committerOz Linden <oz@lindenlab.com>2011-05-20 22:51:11 -0400
commit8f7c287365fa4345fb161d3b311d5b8e820062c4 (patch)
tree1f4514e6e73c9ca2004b33996ef606f09d57a928
parent7ef5a015de031145d4e246bc66332facc7d6fcb4 (diff)
parent5027ee4a8d7ece0e6a2874618637cb6505c959c3 (diff)
merge changes for beta branch tags
-rw-r--r--.hgtags4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f32e71f85c..84124ee8e3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -114,3 +114,7 @@ bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 2.6.6-beta1
11d5d8080e67c3955914caf98f2eb116af30e55a 2.6.9-start
11d5d8080e67c3955914caf98f2eb116af30e55a 2.6.9-start
e67da2c6e3125966dd49eef98b36317afac1fcfe 2.6.9-start
+beafa8a9bd1d1b670b7523d865204dc4a4b38eef DRTVWR-55_2.6.8-beta1
+beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1
+77e5a08344c95738ab879f9671b7758cddd712a3 DRTVWR-57_2.6.9-beta1
+77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-beta1