summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-30 15:10:47 -0400
committerOz Linden <oz@lindenlab.com>2011-03-30 15:10:47 -0400
commit45433246d4daebd8a849be9de947881026c5d095 (patch)
tree12d9e7855a70ffd7ab4b4e4ee6bae9cbbcd1e11a /.hgtags
parent89c838805a88edae377a6285af143ba961290527 (diff)
parentd1ec5eb22bf92e1d9f45a0a4fc615412814f597f (diff)
merge latest changes from merov_linden/viewer-autobuild2010
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index fd247f4519..74d8bbb19a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -84,3 +84,4 @@ f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-start
9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2
9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2
+56b2778c743c2a964d82e1caf11084d76a87de2c 2.6.2-start