Leo Franchi e6efa8dac3 Merge remote-tracking branch 'origin/master' into accounts ...

Conflicts:
	src/libtomahawk/tomahawksettings.cpp
	src/tomahawkapp.cpp

2012-02-24 10:59:47 -06:00

..

icons

Square the .svg version of tomahawk-icon (Larifari's first contribution)

2011-08-27 02:17:53 +02:00

images

Merge remote-tracking branch 'origin/master' into accounts

2012-02-24 10:59:47 -06:00

js

* Removed PhantomJS warning from tomahawk.js.

2011-12-14 17:05:38 +01:00

sql

Added discnumber & composer to the DB schema and sorting by discnumber.

2012-01-22 19:48:18 +01:00

stylesheets

* Made Artist- / TreeView the default view. Disabled album mode for this release.

2011-05-19 08:00:57 +02:00

www

…