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

Merge branch 'master' into spotifyplaylists

This commit is contained in:
Leo Franchi
2012-04-06 20:03:02 -04:00
76 changed files with 1153 additions and 484 deletions

View File

@@ -140,5 +140,6 @@
<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>
<file>data/images/collection.png</file>
</qresource>
</RCC>