Merge branch 'master' into dynamic

Browse Source

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

...

This commit is contained in:

Leo Franchi

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

parent 8f1a768e86 a305c97972

commit c28a7b8aa4

217 changed files with 1227 additions and 2553 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

data/images/list-remove.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 332 B