diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-10-21 14:42:53 +0300 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-10-21 14:42:53 +0300 |
commit | 717b34f53fb3621f103937b03bf70d0ff2fbb475 (patch) | |
tree | 8d1b0411bc1b69efadde8a0eca4c27f3e6152344 /indra/newview/VIEWER_VERSION.txt | |
parent | 82572f0ed422f68838162ead62c7b3ab8ff32014 (diff) | |
parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) |
Merge branch 'master' into DRTVWR-539
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
Diffstat (limited to 'indra/newview/VIEWER_VERSION.txt')
-rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 5dbe61b99e..10abd6ae5b 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.6.5 +6.6.6 |