diff options
| author | McCabe Maxsted | 2010-08-07 06:26:56 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-07 06:26:56 -0700 |
| commit | ba65bf93b515cccd0547469059f3b8a9a03cb4fb (patch) | |
| tree | cf80372e5e4b70d1f0bb9711b1db94e41b2412da /linden/indra/llui/CMakeLists.txt | |
| parent | Fixed time format settings not being saved (diff) | |
| parent | Applied patch by Thickbrick Sleaford for SNOW-793: Memory leak in LLImageForm... (diff) | |
| download | meta-impy-ba65bf93b515cccd0547469059f3b8a9a03cb4fb.zip meta-impy-ba65bf93b515cccd0547469059f3b8a9a03cb4fb.tar.gz meta-impy-ba65bf93b515cccd0547469059f3b8a9a03cb4fb.tar.bz2 meta-impy-ba65bf93b515cccd0547469059f3b8a9a03cb4fb.tar.xz | |
Merge branch '1.3-fweekly-rebase' into weekly
Diffstat (limited to 'linden/indra/llui/CMakeLists.txt')
| -rw-r--r-- | linden/indra/llui/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/llui/CMakeLists.txt b/linden/indra/llui/CMakeLists.txt index f646e63..a0f80b4 100644 --- a/linden/indra/llui/CMakeLists.txt +++ b/linden/indra/llui/CMakeLists.txt | |||
| @@ -63,7 +63,6 @@ set(llui_SOURCE_FILES | |||
| 63 | llspinctrl.cpp | 63 | llspinctrl.cpp |
| 64 | llstyle.cpp | 64 | llstyle.cpp |
| 65 | lltabcontainer.cpp | 65 | lltabcontainer.cpp |
| 66 | lltabcontainervertical.cpp | ||
| 67 | lltextbox.cpp | 66 | lltextbox.cpp |
| 68 | lltexteditor.cpp | 67 | lltexteditor.cpp |
| 69 | lltextparser.cpp | 68 | lltextparser.cpp |
| @@ -119,7 +118,6 @@ set(llui_HEADER_FILES | |||
| 119 | llspinctrl.h | 118 | llspinctrl.h |
| 120 | llstyle.h | 119 | llstyle.h |
| 121 | lltabcontainer.h | 120 | lltabcontainer.h |
| 122 | lltabcontainervertical.h | ||
| 123 | lltextbox.h | 121 | lltextbox.h |
| 124 | lltexteditor.h | 122 | lltexteditor.h |
| 125 | lltextparser.h | 123 | lltextparser.h |