diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-18 23:41:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-18 23:41:19 +0300 |
| commit | 510574dc1416b02d6f045feda2555f87e99d1c0c (patch) | |
| tree | afa1acea9b30cafaa368779e10d94a3ff335232f /indra/newview/VIEWER_VERSION.txt | |
| parent | ebc629ffc45e7d1cf66e3f98ee4ca90dea18af33 (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-501-maint
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.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 a4c853ea2e..133cad286f 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.4.2 +6.4.3 |