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

Browse Source

Conflicts:
	src/libtomahawk/accounts/Account.cpp
	src/tomahawkapp.cpp

...

This commit is contained in:

Leo Franchi

2012-04-14 13:10:06 -04:00

parent c4a9dd6b32 ba064206c4

commit d9f690d9d6

71 changed files with 7022 additions and 914 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/new-releases.png Normal file

Binary file not shown.

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

BIN

data/images/share.png

Binary file not shown.

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