summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-03-25 14:51:29 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-03-25 14:51:29 -0400
commit534ac19ed5a6abe68ea654a5444b7e486f8ce06a (patch)
tree7f50cfebe34b2c5853a6af93e8992bf2909d0ba4 /.hgtags
parent9f2987d995e8a2273f723a387dd587c3dc988056 (diff)
parent44774cd265306c6d29f0a63c0876c7fa7b84311e (diff)
merge from mesh-development to nyx-mesh-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 10be7765c4..a6751aa6a2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -84,3 +84,5 @@ f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
9283d6d1d7eb71dfe4c330e7c9144857e7356bde 2.6.0-beta1
9283d6d1d7eb71dfe4c330e7c9144857e7356bde DRTVWR-40_2.6.0-beta1
c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-start
+9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2
+9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2