Jeff Mitchell 61a379a7d7 Merge branch 'master' into gfw ...

Conflicts:
	src/libtomahawk/CMakeLists.txt

2011-07-07 11:58:17 -04:00

..

gntp-send

Check in gntp-send and a few template files

2011-06-22 17:58:24 -04:00

jreen @ 2957d0ff03

put jreen back in its place

2011-06-14 19:33:00 -04:00

liblastfm2

* Added ArtistInfoWidget, our new Artist page and ViewManager's default show(artist) action.

2011-07-03 02:18:28 +02:00

libportfwd

* Removed assert in portfwd module to make it compile on OS X.

2011-06-19 17:30:02 +02:00

qtweetlib

* Removed un-moc-able headers in thirdparty/qtweetlib.

2011-06-24 11:48:44 +02:00

qxt

don't crash when jason tries to use tomahawk

2011-06-11 12:18:12 -04:00

SPMediaKeyTap

And remove cruft.

2011-05-31 18:21:41 -04:00

winhttp

Fix liblastfm2 mingw32 compilation

2011-05-12 22:35:45 -04:00

CMakeLists.txt

Check in gntp-send and a few template files

2011-06-22 17:58:24 -04:00