Merge branch 'master' into accounts

Browse Source

Conflicts:
	src/libtomahawk/utils/xspfloader.cpp
	src/libtomahawk/utils/xspfloader.h
	src/tomahawkapp.cpp
	src/tomahawkwindow.h

...

This commit is contained in:

Leo Franchi

2012-02-27 08:37:40 -05:00

parent 540db2860e 52baebc899

commit f4c92793e6

38 changed files with 356 additions and 40 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/process-stop.png Normal file

Binary file not shown.

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