1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-31 17:42:13 +02:00

Merge branch 'master' into databasegenerator

Conflicts:
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/database/databasecommand_createplaylist.cpp
	src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
This commit is contained in:
Leo Franchi
2011-08-03 23:31:25 -04:00
50 changed files with 1011 additions and 97 deletions

View File

@@ -8,6 +8,7 @@
<file>./data/images/loved.png</file>
<file>./data/images/not-loved.png</file>
<file>./data/images/no-album-art-placeholder.png</file>
<file>./data/images/no-artist-image-placeholder.png</file>
<file>./data/images/now-playing-panel.png</file>
<file>./data/images/now-playing-speaker.png</file>
<file>./data/images/pause-pressed.png</file>
@@ -62,6 +63,7 @@
<file>./data/images/volume-slider-level.png</file>
<file>./data/images/echonest_logo.png</file>
<file>./data/images/loading-animation.gif</file>
<file>./data/images/info.png</file>
<file>./data/images/home.png</file>
<file>./data/images/back.png</file>
<file>./data/images/forward.png</file>