diff options
| author | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
| commit | 0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/cmake/LLUI.cmake | |
| parent | Imprudence 1.1.0 released. (diff) | |
| parent | Updated Imprudence to be based on SL 1.22.11. (ChangeLog Entry) (diff) | |
| download | meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.zip meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.gz meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.bz2 meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.xz | |
Merge branch 'sl-base-1.22' into next
Conflicts:
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
Diffstat (limited to 'linden/indra/cmake/LLUI.cmake')
| -rw-r--r-- | linden/indra/cmake/LLUI.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/cmake/LLUI.cmake b/linden/indra/cmake/LLUI.cmake index d1287de..34de571 100644 --- a/linden/indra/cmake/LLUI.cmake +++ b/linden/indra/cmake/LLUI.cmake | |||
| @@ -4,6 +4,4 @@ set(LLUI_INCLUDE_DIRS | |||
| 4 | ${LIBS_OPEN_DIR}/llui | 4 | ${LIBS_OPEN_DIR}/llui |
| 5 | ) | 5 | ) |
| 6 | 6 | ||
| 7 | set(LLUI_LIBRARIES | 7 | set(LLUI_LIBRARIES llui) |
| 8 | llui | ||
| 9 | ) | ||