summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-06-06 11:52:37 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-06-06 11:52:37 -0400
commit18d210e9b0adb90ab2bdac863435bd1c3a9d7abf (patch)
tree58496f4e9ebadb36fa5210bfcbc69f1a85421a86 /.hgtags
parentdb2d21a89b62acc14025e7c529721e994ca96a9f (diff)
parent02c85bd02689b773b1a861c4edff865a31986b4f (diff)
reconciled .hgtags
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags5
1 files changed, 4 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 7fcdcfd241..9911452cff 100644
--- a/.hgtags
+++ b/.hgtags
@@ -114,16 +114,19 @@ beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1
11d5d8080e67c3955914caf98f2eb116af30e55a 2.6.9-start
e67da2c6e3125966dd49eef98b36317afac1fcfe 2.6.9-start
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
43c7ee846b7eed80786acbbf35d03bd016a3e85d DRTVWR-59_2.7.0-beta1
43c7ee846b7eed80786acbbf35d03bd016a3e85d 2.7.0-beta1
+77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-release
54fd44ac92e4c61435ea33effe093a3527e18d98 2.7.1-start
0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1
0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1
+9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start