summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-11-16 00:04:41 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-11-16 00:04:41 +0200
commit4810f5ae9bf064fe96f73c014607696660f5c85c (patch)
treec243cc4f9198d0107c9b9f991edf72161f882290
parent3b328a3880972141311d38500e94f7b1bc64786c (diff)
parentecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff)
Merged in lindenlab/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 44ca1e0d7d..c9870bfb0f 100755
--- a/.hgtags
+++ b/.hgtags
@@ -520,3 +520,4 @@ e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release
33981d8130f031597b4c7f4c981b18359afb61a0 4.0.7-release
45eaee56883df7a439ed3300c44d3126f7e3a41e 4.0.8-release
b280a1c797a3891e68dbc237e73de9cf19f426e9 4.1.1-release
+bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 4d0dcda01c..de197cc337 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-4.1.2
+4.1.3