summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-06-21 14:21:45 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-06-21 14:21:45 +0100
commit8abfd8da4fb222382437f4b547567fabc6f75cf8 (patch)
tree1a8b9be4fa4586beb131fe0e37f2f3056ac4d32c /indra/newview
parent02c371e2cc0365c9051e37c50ec0fa028af39b6e (diff)
parent58fea73e609c58aab6e8789f0615f0f896c5815f (diff)
merge
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 8710cfdff2..09b254e90c 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-5.1.6
+6.0.0