1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-30 17:20:26 +02:00

Merge branch 'master' into spotifyplaylists

This commit is contained in:
Leo Franchi
2012-03-18 13:34:01 -04:00
51 changed files with 2503 additions and 1118 deletions

View File

@@ -138,5 +138,6 @@
<file>data/images/spotifycore-logo.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>
</qresource>
</RCC>