Leo Franchi d9f690d9d6 Merge remote-tracking branch 'origin/master' into spotifyplaylists ...

Conflicts:
	src/libtomahawk/accounts/Account.cpp
	src/tomahawkapp.cpp

2012-04-14 13:10:06 -04:00

..

icons

Add grayscale icon to be used for OS X systray

2012-03-18 09:40:22 -04:00

images

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

2012-04-14 13:10:06 -04: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

fix url

2011-03-05 23:53:33 -05:00