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

Merge branch 'master' into decltest

Browse Source 
Conflicts:
	resources.qrc
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
This commit is contained in:
Michael Zanetti
2012-08-03 20:45:26 +02:00
parent 012bb49328 3b083a2535
commit 8f20c828fa
114 changed files with 9117 additions and 3186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources.qrc
View File

@@ -148,6 +148,8 @@
<file>data/images/jump-link.png</file>
<file>data/images/scrollbar-vertical-handle.png</file>
<file>data/images/scrollbar-horizontal-handle.png</file>
<file>data/images/subscribe-on.png</file>
<file>data/images/subscribe-off.png</file>
<file>data/qml/ArtistInfoScene.qml</file>
<file>data/qml/StationScene.qml</file>
<file>data/qml/CoverImage.qml</file>