Leo Franchi
c28a7b8aa4
Merge branch 'master' into dynamic
Conflicts:
src/CMakeLists.txt
src/libtomahawk/collection.cpp
src/libtomahawk/collection.h
src/libtomahawk/network/filetransferconnection.h
src/libtomahawk/playlist.h
src/libtomahawk/query.h
src/libtomahawk/result.h
src/playlist/playlistmanager.cpp
src/playlist/plitem.h
src/tomahawkwindow.cpp
2011-01-03 22:31:37 -06:00
..
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-12-11 15:59:19 -05:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-12-03 18:36:31 +01:00
2010-12-11 15:59:19 -05:00
2011-01-03 22:31:37 -06:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-11-21 10:05:11 +01:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00