summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-06-09 14:12:53 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-06-09 14:12:53 -0400
commitad3182c4ff01b207d93a47a8dbeec89454514b98 (patch)
tree88aaca2f19d86c6f805d05bbc38a2905876d575c
parent3c539c498a328696c9aa3cd8f00519d9ad0a40e8 (diff)
parenteef9016ca15631783e0d61b98da858a971b2ab72 (diff)
reconciled .hgtags
-rw-r--r--.hgtags4
1 files changed, 2 insertions, 2 deletions
diff --git a/.hgtags b/.hgtags
index 92c6d1dbbd..253639c564 100644
--- a/.hgtags
+++ b/.hgtags
@@ -130,8 +130,8 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-beta1
8835e0e3c0d3a48244c287bc05811dfc2fba43ec 2.7.0-start
54fd44ac92e4c61435ea33effe093a3527e18d98 2.7.1-start
-dac76a711da5f1489a01c1fa62ec97d99c25736d DRTVWR-51_2.6.6-release
-dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
+0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1
+0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1
8f2da1701c81a62352df2b8d413d27fb2cade9a6 DRTVWR-46_2.6.3-release
8f2da1701c81a62352df2b8d413d27fb2cade9a6 2.6.3-release
77e5a08344c95738ab879f9671b7758cddd712a3 DRTVWR-56_2.6.9-release