summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-21 13:34:51 -0700
committersimon <none@none>2013-08-21 13:34:51 -0700
commit2b634d6c45d61f7132fc124e559347a736c6dfda (patch)
treea39df34ed7ef61878fd6bda0b3cb7038838fd185
parente0227f29f8ab30bb1a1e1c7ebe73385015d2a073 (diff)
parent171089207b528ab80a954292c127ba77254ee927 (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 00dbda157d..c892fcb28e 100755
--- a/.hgtags
+++ b/.hgtags
@@ -465,3 +465,4 @@ fb1630153bac5552046ea914af3f14deabc1def8 3.6.0-materials-beta1
0a56f33ad6aa112032b14a41dad759ad377bdde9 3.6.0-release
75cf8e855ae1af6895a35da475314c2b5acf1850 3.6.1-release
f6741d5fe8d632651424484df0fe0cb4a01e9fbe 3.6.2-release
+fe4f7c5e9fd27e09d03deb1cc9ab3e5093f6309e 3.6.3-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 4a788a01da..0f44168a4d 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.6.3
+3.6.4