summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2013-08-05 19:44:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2013-08-05 19:44:12 -0400
commitf4943bb2e6d59103d6e6a511ff8f06adb1c90a41 (patch)
treef0b89a006e52e38039d142048adf9034cbcb2b76 /.hgtags
parent32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff)
parent7f6e7fc0cb15d5367d48a3d8084d1a0b319575b7 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags3
1 files changed, 1 insertions, 2 deletions
diff --git a/.hgtags b/.hgtags
index 9ca419211e..f0b0ec22fa 100755
--- a/.hgtags
+++ b/.hgtags
@@ -458,8 +458,7 @@ a314f1c94374ab1f6633dd2983f7090a68663eb2 3.5.2-beta4
9b1b6f33aa5394b27bb652b31b5cb81ef6060370 3.5.2-release
a277b841729f2a62ba1e34acacc964bc13c1ad6f 3.5.3-release
fb1630153bac5552046ea914af3f14deabc1def8 3.6.0-materials-beta1
-69429d81ae4dd321eda2607901ef0a0fde71b54c 3.6.0-release
-69429d81ae4dd321eda2607901ef0a0fde71b54c 3.6.0-release
0a56f33ad6aa112032b14a41dad759ad377bdde9 3.6.0-release
+83357f31d8dbf048a8bfdc323f363bf4d588aca1 CHOP-951-a
75cf8e855ae1af6895a35da475314c2b5acf1850 3.6.1-release
f6741d5fe8d632651424484df0fe0cb4a01e9fbe 3.6.2-release