summaryrefslogtreecommitdiff
path: root/indra/newview/VIEWER_VERSION.txt
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-08-26 18:54:39 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-08-26 18:54:39 -0400
commitf00b6c713347155fbde7e4c68e9656d29c13c6fc (patch)
tree757be382d012da06b2d730f07d06eed41091fb67 /indra/newview/VIEWER_VERSION.txt
parenta45806e17cc99961ab559f544f43691ccafa9bf2 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge. Pull in viewer-release after SSA merge.
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 b72762837e..d15b8b06fa 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.2
+3.6.5