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

Merge branch 'master' into accounts

Browse Source 
Conflicts:
	src/libtomahawk/utils/xspfloader.cpp
	src/libtomahawk/utils/xspfloader.h
	src/tomahawkapp.cpp
	src/tomahawkwindow.h
This commit is contained in:
Leo Franchi
2012-02-27 08:37:40 -05:00
parent 540db2860e 52baebc899
commit f4c92793e6
38 changed files with 356 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources.qrc
View File

@@ -135,5 +135,6 @@
<file>data/images/rdio.png</file>
<file>data/images/lastfm-icon.png</file>
<file>data/sql/dbmigrate-27_to_28.sql</file>
<file>data/images/process-stop.png</file>
</qresource>
</RCC>