summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-28 10:26:00 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-28 10:26:00 -0400
commit690105630e7738ffb995f3aa061b1c5c5aaf2830 (patch)
tree9996d6ab36ea6dc4ab6483de4c54b512c30fcfa5 /.hgtags
parentebfc46a9ae6cb83ca699a5e45ed5b5a737413f2c (diff)
parent68a7f7c24168f03d72e6b20ff1dcfbd843879b5d (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index a6751aa6a2..56dc0c288f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -86,3 +86,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