summaryrefslogtreecommitdiff
path: root/indra/newview/VIEWER_VERSION.txt
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
commitda135de77dea24427f5e658ebac43b77c215cc9b (patch)
treeb6ccf4971d081a6dfc78a2729d015a7f01e912b2 /indra/newview/VIEWER_VERSION.txt
parentb2d769534c82de2ac7b36f11ce6fab61f3e0d378 (diff)
parentfc4f6e2dacfc8944b1536004fed80c4ca3a24544 (diff)
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
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