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

Merge branch 'master' into whatshot

Browse Source 
Conflicts:
	src/libtomahawk/CMakeLists.txt
This commit is contained in:
Casey Link
2011-08-29 10:43:10 -05:00
parent 2bff9e9a27 65709e92ff
commit a25d174f64
86 changed files with 3754 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources.qrc
View File

@@ -110,5 +110,10 @@
<file>data/sql/dbmigrate-25_to_26.sql</file>
<file>data/js/tomahawk.js</file>
<file>data/images/avatar_frame.png</file>
<file>data/images/drop-all-songs.png</file>
<file>data/images/drop-local-songs.png</file>
<file>data/images/drop-top-songs.png</file>
<file>data/images/drop-song.png</file>
<file>data/images/drop-album.png</file>
</qresource>
</RCC>