summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-29 19:32:41 -0400
committerOz Linden <oz@lindenlab.com>2011-03-29 19:32:41 -0400
commitf633aef1af5a1a695df655080d3a20c033a31e18 (patch)
tree28776800d7039476587adfe91d92ec5f515c652f /.hgtags
parent6418ccc9e5a03d32778c8588139fe939a969838a (diff)
parentb595bbcf2af03b2a285c2df450379b670bddbfbc (diff)
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 74d8bbb19a..2f6fd6e0e7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -82,6 +82,10 @@ f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
9283d6d1d7eb71dfe4c330e7c9144857e7356bde 2.6.0-beta1
9283d6d1d7eb71dfe4c330e7c9144857e7356bde DRTVWR-40_2.6.0-beta1
c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-start
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 DRTVWR-43_2.6.1-beta1
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1
9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2
9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2
56b2778c743c2a964d82e1caf11084d76a87de2c 2.6.2-start
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 DRTVWR-43_2.6.1-beta1
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1