diff options
| author | McCabe Maxsted | 2010-09-07 18:00:34 -0700 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:38:28 +0200 |
| commit | df82325063d61b92cac749c11b7057abf7d769e8 (patch) | |
| tree | 9d22e1aa4dee7d2ad99bd8cf1290ad3b6dd0794d | |
| parent | CMake now runs correctly on Windows (diff) | |
| download | meta-impy-df82325063d61b92cac749c11b7057abf7d769e8.zip meta-impy-df82325063d61b92cac749c11b7057abf7d769e8.tar.gz meta-impy-df82325063d61b92cac749c11b7057abf7d769e8.tar.bz2 meta-impy-df82325063d61b92cac749c11b7057abf7d769e8.tar.xz | |
Removed some bad merge entries from newview/CMakeLists.txt
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index aef0b44..b576ccd 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
| @@ -1139,8 +1139,6 @@ set(viewer_XUI_FILES | |||
| 1139 | 1139 | ||
| 1140 | 1140 | ||
| 1141 | ) | 1141 | ) |
| 1142 | list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST}) | ||
| 1143 | list(SORT viewer_XUI_FILES) | ||
| 1144 | 1142 | ||
| 1145 | list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST}) | 1143 | list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST}) |
| 1146 | list(SORT viewer_XUI_FILES) | 1144 | list(SORT viewer_XUI_FILES) |