1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00

Merge remote-tracking branch 'origin/master' into sourcelistrefactor

Conflicts:
	src/sourcetree/sourcetreeitem.cpp
	src/sourcetree/sourcetreeview.cpp
	thirdparty/jreen
This commit is contained in:
Leo Franchi
2011-04-21 11:32:14 -04:00
38 changed files with 1127 additions and 289 deletions

View File

@@ -1,5 +1,5 @@
add_subdirectory( jdns )
add_subdirectory( qtweetlib )
ADD_SUBDIRECTORY( jdns )
ADD_SUBDIRECTORY( qtweetlib )
ADD_SUBDIRECTORY( libportfwd )
ADD_SUBDIRECTORY( qxt )
ADD_SUBDIRECTORY( liblastfm2 )