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

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

Browse Source 
Conflicts:
	src/libtomahawk/globalactionmanager.cpp
This commit is contained in:
Leo Franchi
2012-04-11 10:24:02 -04:00
parent 042b27ea83 c5eb71d0de
commit 4871b6b76c
32 changed files with 1154 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources.qrc
View File

@@ -137,6 +137,7 @@
<file>data/images/lastfm-icon.png</file>
<file>data/images/spotifycore-logo.png</file>
<file>data/images/playlist-header-tiled.png</file>
<file>data/images/share.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>