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/LLDatabase.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/LLDatabase.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linden/indra/cmake/LLDatabase.cmake b/linden/indra/cmake/LLDatabase.cmake index c3cf622..6526101 100644 --- a/linden/indra/cmake/LLDatabase.cmake +++ b/linden/indra/cmake/LLDatabase.cmake | |||
| @@ -7,7 +7,4 @@ set(LLDATABASE_INCLUDE_DIRS | |||
| 7 | ${MYSQL_INCLUDE_DIR} | 7 | ${MYSQL_INCLUDE_DIR} |
| 8 | ) | 8 | ) |
| 9 | 9 | ||
| 10 | set(LLDATABASE_LIBRARIES | 10 | set(LLDATABASE_LIBRARIES lldatabase) |
| 11 | lldatabase | ||
| 12 | ${MYSQL_LIBRARIES} | ||
| 13 | ) | ||