Merge branch 'master' into databasegenerator

Browse Source

Conflicts:
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/globalactionmanager.cpp

...

This commit is contained in:

Leo Franchi

2011-08-05 15:38:26 -04:00

parent a9111267e8 b2deebe0c2

commit b15d3162de

39 changed files with 937 additions and 388 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

BIN

data/images/info.png

Binary file not shown.

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