Merge branch 'master' into spotifyplaylists

Browse Source

...

This commit is contained in:

Leo Franchi

2012-03-18 13:34:01 -04:00

parent 9b1a983cfd 42b2779240

commit a710782624

51 changed files with 2503 additions and 1118 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/icons/tomahawk-icon-128x128-grayscale.png Normal file

Binary file not shown.

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