summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-27 18:17:16 -0400
committerOz Linden <oz@lindenlab.com>2013-06-27 18:17:16 -0400
commit743b6ca6177f46d7d7f964993ee226ef6706d408 (patch)
treeeb56fb5af91bc4dd8f747be02a36a26ddef20561 /indra
parent1c6783fdb564cb10ade2a585a874ce951fff34e6 (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
merge changes for 3.6.1-release
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 9575d51bad..b72762837e 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.1
+3.6.2