summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-06-19 07:02:17 -0700
committerGraham Linden <graham@lindenlab.com>2013-06-19 07:02:17 -0700
commitedbacfa108ad55da7f852e401271eb5893e1dab9 (patch)
tree677a74b2d274ba3fc14dfa30431b6c3e8ab34fbf /indra
parent0094cfabf05c483077a2f5497cf988a8d7f15807 (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
Merge vwr-dev-mat release tags and version change
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 40c341bdcd..9575d51bad 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.0
+3.6.1