Jeff Mitchell a81bca6ce1 Merge remote branch 'origin/master' into leos-crash ...

Conflicts:
	src/sip/twitter/twitter.cpp
	src/sip/twitter/twitterconfigwidget.cpp

2011-05-03 21:58:24 -04:00

..

jdns

Install a .protocol file on KDE so tomahawk:// links work there too

2011-04-11 15:36:29 -04:00

jreen @ 40fd6b0a3d

Merge branch 'master' of github.com:tomahawk-player/tomahawk

2011-05-03 15:56:08 -04:00

liblastfm2

Remove extra liblastfm2 debug

2011-05-03 21:48:14 -04:00

libportfwd

Install a .protocol file on KDE so tomahawk:// links work there too

2011-04-11 15:36:29 -04:00

qtweetlib

Switch around when the oauthtwitter gets its nam and add some debug

2011-05-03 14:18:05 -04:00

qxt

Limit policy setting to 2.8.4 or higher

2011-04-12 11:00:07 -04:00

CMakeLists.txt

* Merged master into phonon branch.

2011-04-19 00:03:55 +02:00