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

Browse Source

Conflicts:
	resources.qrc

...

This commit is contained in:

Leo Franchi

2012-04-01 12:56:24 -04:00

parent 676bf7f6d7 3f65e2b73c

commit eeddd067ea

11 changed files with 119 additions and 17 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-header-tiled.png Normal file

Binary file not shown.

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