summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-01 21:40:33 -0400
committerOz Linden <oz@lindenlab.com>2011-06-01 21:40:33 -0400
commit60d32f0a97eca0f8b7ef7a19625e33779d750f0a (patch)
treedc4203fcd649698de4b3f963a241921f6e722a0d
parent147567349ec0662300c2a7b80bf7729a2e064c4d (diff)
parentffe8417a0410a554e22210c83feadeea76d0ab8a (diff)
merge tags from release branch
-rw-r--r--.hgtags4
1 files changed, 3 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index ba30e72b5f..ef0cae0a48 100644
--- a/.hgtags
+++ b/.hgtags
@@ -121,12 +121,14 @@ 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
be2000b946f8cb3de5f44b2d419287d4c48ec4eb DRTVWR-54_2.6.8-release
be2000b946f8cb3de5f44b2d419287d4c48ec4eb 2.6.8-release
dac76a711da5f1489a01c1fa62ec97d99c25736d DRTVWR-51_2.6.6-release
dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
8f2da1701c81a62352df2b8d413d27fb2cade9a6 DRTVWR-46_2.6.3-release
8f2da1701c81a62352df2b8d413d27fb2cade9a6 2.6.3-release
-77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-beta1
+77e5a08344c95738ab879f9671b7758cddd712a3 DRTVWR-56_2.6.9-release
8835e0e3c0d3a48244c287bc05811dfc2fba43ec 2.7.0-start
+77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-release
54fd44ac92e4c61435ea33effe093a3527e18d98 2.7.1-start