1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-25 15:01:11 +02:00

Merge remote branch 'origin/master' into liblastfm2

This commit is contained in:
Jeff Mitchell
2011-03-25 09:40:56 -04:00
12 changed files with 35 additions and 9 deletions

View File

@@ -181,6 +181,7 @@ endif(APPLE)
target_link_libraries(tomahawk_qtweetlib
${QT_LIBRARIES}
${QJSON_FLAGS}
${QJSON_LIBRARIES}
)
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )