summaryrefslogtreecommitdiff
path: root/indra/newview/VIEWER_VERSION.txt
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2021-07-19 17:43:19 -0700
committerCallum Prentice <callum@lindenlab.com>2021-07-19 17:43:19 -0700
commita242edc99d62f9f242c2f7f778f347af03a6f5a9 (patch)
tree74c5672c9a045e5c8891702cc77eae9062dc9756 /indra/newview/VIEWER_VERSION.txt
parent95b26d3becf8fef901ea09998866a9d8227cdcad (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
Diffstat (limited to 'indra/newview/VIEWER_VERSION.txt')
-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 22beed373e..a15225fad6 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.4.21
+6.4.22