mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-31 09:32:03 +02:00
Code Issues Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

1
resources.qrc
View File

@@ -136,6 +136,7 @@
<file>data/images/grooveshark.png</file>
<file>data/images/lastfm-icon.png</file>
<file>data/images/spotifycore-logo.png</file>
<file>data/images/playlist-header-tiled.png</file>
<file>data/sql/dbmigrate-27_to_28.sql</file>
<file>data/images/process-stop.png</file>
<file>data/icons/tomahawk-icon-128x128-grayscale.png</file>