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

Services

Browse Source 
Merge branch 'accounts'

Conflicts:
	resources.qrc
	src/accounts/zeroconf/zeroconf.cpp
This commit is contained in:
Leo Franchi
2012-03-07 18:23:32 -05:00
parent 935b046acc 2878552239
commit 0067e376ae
131 changed files with 7541 additions and 4348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources.qrc
View File

@@ -134,6 +134,7 @@
<file>data/images/no-album-no-case.png</file>
<file>data/images/rdio.png</file>
<file>data/images/grooveshark.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>