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

..

icons

* Tomahawk icon as original uncompressed SVG added.

2010-12-03 18:21:37 +01:00

images

Merge branch 'master' into dynamic

2011-01-03 22:31:37 -06:00

topbar-radiobuttons.css

Initial Tomahawk import.

2010-10-17 05:32:01 +02:00