Leo Franchi 0067e376ae Services ...

Merge branch 'accounts'

Conflicts:
	resources.qrc
	src/accounts/zeroconf/zeroconf.cpp

2012-03-07 18:23:32 -05:00

..

icons

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

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

images

Services

2012-03-07 18:23:32 -05: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

…

www

…