summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon <none@none>2014-05-20 17:30:11 -0700
committersimon <none@none>2014-05-20 17:30:11 -0700
commit765b267d0cf3f8c5e52482a214e3245b9ab2d066 (patch)
tree0b8da1cb40bf8de2fe749b11bc2c10d91db63d91
parent4fa7ae949200928cfac51e045fecf2178a649b7b (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
Merge release and 3.7.9
-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 c36ce93d0e..0f990fc3b9 100755
--- a/.hgtags
+++ b/.hgtags
@@ -480,3 +480,4 @@ d076568ff7883b41c149e6afb421f39c29dbfe2b 3.7.4-release
fc066b82343fca51f9c1b8eda0abc6bee9bb4503 3.7.5-release
d029faf69f20a23007f32420a1ac6a3b89a6d441 3.7.6-release
83959480cb986522d07b151a0c778ab7f920d41b 3.7.7-release
+bba9b3722eea08949e4ff69591f736bf0f808434 3.7.8-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index a0fc9e07cb..c77a7de85c 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.7.8
+3.7.9