summaryrefslogtreecommitdiff
path: root/indra/newview/VIEWER_VERSION.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-21 14:08:38 -0500
committerOz Linden <oz@lindenlab.com>2013-11-21 14:08:38 -0500
commit45bc601563337b99ca3dc0d733196d7a00dd54d7 (patch)
tree2d49bf2ce2589947d1b80770f5fa7a312a1f908b /indra/newview/VIEWER_VERSION.txt
parent4f2a7167b6d6b3b278b39ea7b97beb89f6abb5ee (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
merge changes for 3.6.11-release
Diffstat (limited to 'indra/newview/VIEWER_VERSION.txt')
-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 e8b6c77dc9..8b7b0b52e5 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.11
+3.6.12