diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-29 20:04:33 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-29 20:04:33 +0300 |
| commit | c54382b760c24069d979c0a848c2f6248cb37d7d (patch) | |
| tree | 1b023aebf3a68386f96ea6f742102d0a65981653 /indra/newview/VIEWER_VERSION.txt | |
| parent | a91e22731998230f9b41d6d86328b66bf7a122ae (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge branch 'master' into DRTVWR-518-ui
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
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 a0b6fce83f..427dc381ad 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.4.18 +6.4.19 |