summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorsimon <none@none>2013-11-12 11:22:15 -0800
committersimon <none@none>2013-11-12 11:22:15 -0800
commita7381f6e40388900dd956a54167a33266e82238c (patch)
tree854cbeacb3ed1a8eb4385e8805cc33d6065792ac /indra/newview
parent742d866265a99b1cf916de7acb58e0f8314b950f (diff)
parentebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff)
Merge 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 c47e8b5872..e8b6c77dc9 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.10
+3.6.11