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:
4
thirdparty/CMakeLists.txt
vendored
4
thirdparty/CMakeLists.txt
vendored
@@ -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 )
|
||||
|
Reference in New Issue
Block a user