mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-30 09:10:53 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'origin/master' into dynamic

Browse Source 
Conflicts:
	CMakeLists.txt
	src/libtomahawk/playlist/playlistmanager.cpp
This commit is contained in:
Leo Franchi
2011-01-29 09:15:29 -05:00
parent d22acbc716 f105b18560
commit c22c3440d1
31 changed files with 12996 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -14,7 +14,7 @@ ELSE()
ENDIF()
FIND_PACKAGE( Taglib 1.6.0 REQUIRED )
FIND_PACKAGE( LibLastFm REQUIRED )
FIND_PACKAGE( LibLastFm 0.3.3 REQUIRED )
FIND_PACKAGE( LibEchonest 1.1.1 REQUIRED )
IF( UNIX AND NOT APPLE )
@@ -23,6 +23,7 @@ ELSE()
ADD_SUBDIRECTORY( rtaudio )
ENDIF( UNIX AND NOT APPLE )
ADD_SUBDIRECTORY( thirdparty )
ADD_SUBDIRECTORY( libportfwd )
ADD_SUBDIRECTORY( qxt )
ADD_SUBDIRECTORY( src/libtomahawk )