summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-21 15:35:25 -0500
committerOz Linden <oz@lindenlab.com>2013-11-21 15:35:25 -0500
commit915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (patch)
tree577c0d98b21d05f0b6f28241f2ab2b7ee31f8618 /.hgtags
parentdd7b0f96157bdfbdd8892cc8aa209182ae777380 (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
merge changes for 3.6.11-release
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index d598ff1f62..85c17be67d 100755
--- a/.hgtags
+++ b/.hgtags
@@ -469,3 +469,4 @@ ae457ece77001767ae9613148c495e7b98cc0f4a 3.6.7-release
d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 3.6.8-release
70eda3721d36df3e00730629c42a1304e5bc65b8 3.6.9-release
5b54b36862ff8bc3b6935673c9d1c1f22ee8d521 3.6.10-release
+2feb70a4cfde43f2898d95ff8fcae3e67805c7c2 3.6.11-release