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

Merge remote branch 'origin/master' into dynamic

Browse Source 
Conflicts:
	CMakeLists.txt
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/database/databasecommand_alltracks.cpp
	src/libtomahawk/database/databasecommand_loadplaylistentries.cpp
	src/libtomahawk/database/databaseimpl.cpp
	src/libtomahawk/database/schema.sql
	src/libtomahawk/database/schema.sql.h
	src/libtomahawk/query.h
This commit is contained in:
Leo Franchi
2011-02-03 08:45:14 -05:00
parent 50a3c51bfa 90535eed4e
commit c09791d3df
41 changed files with 432 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -16,6 +16,7 @@ ENDIF()
FIND_PACKAGE( Taglib 1.6.0 REQUIRED )
FIND_PACKAGE( LibLastFm 0.3.3 REQUIRED )
FIND_PACKAGE( LibEchonest 1.1.1 REQUIRED )
FIND_PACKAGE( CLucene REQUIRED )
IF( UNIX AND NOT APPLE )
ADD_SUBDIRECTORY( alsa-playback )