diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
commit | db11a76d519ebb076ec0b72284993d7f6c15f383 (patch) | |
tree | 2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/newview/CMakeLists.txt | |
parent | 3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff) | |
parent | fb8ba15801f0620699fecdf2ed08668df0be7210 (diff) |
Merge from viewer-development post 2.4 release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 515f82a19a..1176edc130 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1327,7 +1327,7 @@ set(viewer_APPSETTINGS_FILES app_settings/grass.xml app_settings/high_graphics.xml app_settings/ignorable_dialogs.xml - app_settings/keys.ini + app_settings/keys.xml app_settings/keywords.ini app_settings/logcontrol.xml app_settings/low_graphics.xml |