summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2021-03-11 15:12:36 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2021-03-11 15:12:36 +0000
commitef2decdbe9fd2add86f1117f423b680a3b79f927 (patch)
tree5eefee1c395359e023db8d8aac9fe43eb0d5d91c /indra/newview
parentacb2e87d9425c8f671d9772409fd291d7fed9aa7 (diff)
parent88d837c16e768c5262073a7df965066d4bd8842c (diff)
Merge remote-tracking branch 'origin/master' into SL-14862
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index df41a3918c..dbe6222fdd 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.4.14
+6.4.17