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/LLImage.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 '')
| -rw-r--r-- | linden/indra/cmake/LLImage.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linden/indra/cmake/LLImage.cmake b/linden/indra/cmake/LLImage.cmake index 8874fa5..ec3da89 100644 --- a/linden/indra/cmake/LLImage.cmake +++ b/linden/indra/cmake/LLImage.cmake | |||
| @@ -8,8 +8,4 @@ set(LLIMAGE_INCLUDE_DIRS | |||
| 8 | ${JPEG_INCLUDE_DIRS} | 8 | ${JPEG_INCLUDE_DIRS} |
| 9 | ) | 9 | ) |
| 10 | 10 | ||
| 11 | set(LLIMAGE_LIBRARIES | 11 | set(LLIMAGE_LIBRARIES llimage) |
| 12 | llimage | ||
| 13 | ${JPEG_LIBRARIES} | ||
| 14 | ${PNG_LIBRARIES} | ||
| 15 | ) | ||