Merge branch 'master' into decltest

Browse Source

Conflicts:
	resources.qrc
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp

...

This commit is contained in:

Michael Zanetti

2012-08-03 20:45:26 +02:00

parent 012bb49328 3b083a2535

commit 8f20c828fa

114 changed files with 9117 additions and 3186 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/playlist-subscribed.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

data/images/subscribe-off.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

data/images/subscribe-on.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB