diff options
| author | David Walter Seikel | 2012-02-20 22:10:26 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2012-02-20 22:10:26 +1000 |
| commit | ca7fd07f6600f73bd2050c1499e379f7d5038fa9 (patch) | |
| tree | 310d5ab5e3f9d4164b9220a152618bb2ed2162ba /linden/indra/newview/CMakeLists.txt | |
| parent | Support the new WindlightReset message from OpenSim for resetting Windlight p... (diff) | |
| parent | Adding my linux build scripts. Makes it easy to build under 32 and 64 bit li... (diff) | |
| download | meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.zip meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.gz meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.bz2 meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.xz | |
Merge branch 'next' of git://github.com/imprudence/imprudence into next
Conflicts:
linden/indra/newview/installers/windows/meta-impy_installer_template.iss
Branding conflict, fixed.
linden/indra/newview/llviewerwindow.cpp
Already had this change, but merged the minor difference.
Diffstat (limited to 'linden/indra/newview/CMakeLists.txt')
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 9ccaac8..ecbeb9b 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
| @@ -1292,7 +1292,7 @@ set_source_files_properties(${viewer_CHARACTER_FILES} | |||
| 1292 | list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES}) | 1292 | list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES}) |
| 1293 | 1293 | ||
| 1294 | if (WINDOWS) | 1294 | if (WINDOWS) |
| 1295 | file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi) | 1295 | file(GLOB viewer_INSTALLER_FILES installers/windows/*.iss) |
| 1296 | 1296 | ||
| 1297 | source_group("Installer Files" FILES ${viewer_INSTALLER_FILES}) | 1297 | source_group("Installer Files" FILES ${viewer_INSTALLER_FILES}) |
| 1298 | 1298 | ||