Leo Franchi ea7e8f6ede Merge remote-tracking branch 'origin/master' ...

Conflicts:
	src/libtomahawk/sip/SipPlugin.cpp
	src/resolverconfigdelegate.cpp
	src/sip/jreen/jabber.cpp
	src/sip/jreen/jabber.h

2011-05-03 16:16:16 -04:00

..

jdns

…

jreen @ 40fd6b0a3d

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

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

liblastfm2

A bit more safety -- kind of redundant with the mutex, but doesn't hurt to have it

2011-05-03 08:03:01 -04:00

libportfwd

…

qtweetlib

…

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