summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon <none@none>2013-10-16 14:59:52 -0700
committersimon <none@none>2013-10-16 14:59:52 -0700
commitdc83ea19d563265f86c6f54f02cfcfad467635f1 (patch)
treeda4ec609f08e36de98bc869048625278021ac344
parentd61b6425b7a90b50ea121656ac34cc2a989f9bfb (diff)
parentc7057c141c38492bfdc2bfe9d82de97a7364f01b (diff)
Merge viewer-release
-rwxr-xr-x.hgtags1
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index d993cb70b9..2efe658de2 100755
--- a/.hgtags
+++ b/.hgtags
@@ -466,3 +466,4 @@ fe4f7c5e9fd27e09d03deb1cc9ab3e5093f6309e 3.6.3-release
91ed595b716f14f07409595b734fda891a59379e 3.6.4-release
bf6d453046011a11de2643fac610cc5258650f82 3.6.5-release
ae457ece77001767ae9613148c495e7b98cc0f4a 3.6.7-release
+d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 3.6.8-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 424e1794de..cff2619cfb 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.8
+3.6.9