summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-10-17 15:22:18 -0700
committerMerov Linden <merov@lindenlab.com>2013-10-17 15:22:18 -0700
commit3111cf4ccf34f4bfe5aa0c1935f0a13c870a76ea (patch)
tree8a93f4f27b4299d11b3d698dbe8763f8a3f7d8ae
parentbe01ac2a365662360c6f64ac6cb8b4ea083291cb (diff)
parentc71d9f13effe2d2877ce23821fd4da0ae9ac8fda (diff)
Pull merge from 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