Merge remote-tracking branch 'origin/master' into accounts

Browse Source

Conflicts:
	src/libtomahawk/tomahawksettings.cpp
	src/tomahawkapp.cpp

...

This commit is contained in:

Leo Franchi

2012-02-24 10:59:47 -06:00

parent ac42abda7f cfe42d10ea

commit e6efa8dac3

46 changed files with 389 additions and 170 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/no-album-art-placeholder.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 68 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

data/images/no-album-no-case.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 68 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

data/images/no-artist-image-placeholder.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 91 KiB After Width:  |  Height:  |  Size: 12 KiB