summaryrefslogtreecommitdiff
path: root/indra
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 /indra
parentde5307ab1d907187088fb5b528938ed96d0717b3 (diff)
parent8f9e139b33434bee7562f74efbf094853df36280 (diff)
Merge downstream code and become version 3.7.26
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
1 files changed, 1 insertions, 1 deletions
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