Merge branch 'master' into databasegenerator

Browse Source

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

parent 8e51953427 d3eb8df91a

commit a9111267e8

50 changed files with 1011 additions and 97 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

data/images/configure.png Executable file → Normal file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

BIN

data/images/filter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

0

data/images/home.png Executable file → Normal file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

BIN

data/images/info.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 4.0 KiB

0

data/images/music-icon.png Executable file → Normal file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

BIN

data/images/share.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.8 KiB

0

data/images/view-refresh.png Executable file → Normal file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 2.0 KiB