summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2013-07-22 22:24:32 -0400
committerNat Goodspeed <nat@lindenlab.com>2013-07-22 22:24:32 -0400
commit39bd14f3ca26c04072dcee68c5757232412f4014 (patch)
tree9d1081d315c4d80c3e94e3e4af9300f7a422800a /.hgtags
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
parente121f3f409873989ec66193eb97b868ce8ad7f29 (diff)
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags3
1 files changed, 1 insertions, 2 deletions
diff --git a/.hgtags b/.hgtags
index c614db0d3e..066f705b9e 100755
--- a/.hgtags
+++ b/.hgtags
@@ -458,7 +458,6 @@ 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