summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon <none@none>2014-12-19 11:11:02 -0800
committersimon <none@none>2014-12-19 11:11:02 -0800
commitbab0cf6e9f7f8f30f325b48f550d0c7eedaee112 (patch)
treeeca99abfb629a6d4ac7f5c14a0aeff2b026b9883
parent04a5080b670781d1f26e0878971013f37b1592d2 (diff)
parent277e3268cf185f4f3563de36238c6b20ccdd8ad9 (diff)
Merge downstream code and become 3.7.24
-rwxr-xr-x.hgtags1
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 8f6b31ecc6..a9ab8061d3 100755
--- a/.hgtags
+++ b/.hgtags
@@ -495,3 +495,4 @@ bcc2770e21c125e0bab59141c51db9145aec068d 3.7.17-release
27094824773b907c2e559396e6f9ec3a963de52d 3.7.20-release
9ecab4b0c7d8614767724a3422d3c1dca6bd4e4f 3.7.21-release
bc61801f614022c920cb5c3df1d7d67a9561ce1f 3.7.22-release
+3be800e1afad9615442159e388d6d137be7b951e 3.7.23-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index a4de059bbc..f36181278b 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.7.23
+3.7.24