summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon <none@none>2015-03-05 10:42:15 -0800
committersimon <none@none>2015-03-05 10:42:15 -0800
commit8d8ea3b82ffd200a162ac2d07b438335d27e54d8 (patch)
tree627ca5debdad6c90a894802a0f5599fc64a4260b
parentde5307ab1d907187088fb5b528938ed96d0717b3 (diff)
parent8f9e139b33434bee7562f74efbf094853df36280 (diff)
Merge downstream code and become version 3.7.26
-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 81248f02a7..6db0a64173 100755
--- a/.hgtags
+++ b/.hgtags
@@ -497,3 +497,4 @@ bcc2770e21c125e0bab59141c51db9145aec068d 3.7.17-release
bc61801f614022c920cb5c3df1d7d67a9561ce1f 3.7.22-release
3be800e1afad9615442159e388d6d137be7b951e 3.7.23-release
d3d0101e980ec95043e0af9b7903045d3bc447e4 3.7.24-release
+9978a8c3a2ffce4a5e1c186256581c2ac139c9dc 3.7.25-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index c282746153..e5403775b2 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.7.25
+3.7.26