summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-21 13:59:10 -0700
committersimon <none@none>2013-08-21 13:59:10 -0700
commit33a4d333e96e8c1c501f1afeced1d5e088cb8b1e (patch)
tree548a5fc84f34dfb514b6134fbe078c1ffaff2d9f /indra/newview
parentce6d63be47a7588b7b8ff53bf38d73eabc4ab04b (diff)
parent2b634d6c45d61f7132fc124e559347a736c6dfda (diff)
Merge downstream code, including viewer-release
Diffstat (limited to 'indra/newview')
-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 4a788a01da..0f44168a4d 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.3
+3.6.4