summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-31 16:40:57 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-31 16:40:57 -0400
commit8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (patch)
treeedddbe8910b253d803d754ef0a87c95b74ba3adc /.hgtags
parent3a08499572250b46d061106298e2d2777276efc1 (diff)
parent5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 56dc0c288f..733a793823 100644
--- a/.hgtags
+++ b/.hgtags
@@ -84,6 +84,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
+42f32494bac475d0737799346f6831558ae8bf5d DRTVWR-39_2.6.0-release
+42f32494bac475d0737799346f6831558ae8bf5d 2.6.0-release