1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-24 03:43:56 +01:00

6 Commits

Author SHA1 Message Date
Jeff Mitchell
65c8739da5 Merge branch 'master' into infoplugins and fix up problematic bits. This
fully separates out all infoplugins into separate buildable units.
Eventually I'll make cmake switches to enable easy picking of the
different plugins at build-time; distros will like that.

Conflicts:
	src/infoplugins/generic/CMakeLists.txt
	src/infoplugins/generic/ChartsPlugin.cpp
	src/infoplugins/generic/ChartsPlugin.h
	src/infoplugins/generic/ChartsPlugin_Data_p.h
	src/infoplugins/generic/charts/ChartsPlugin.cpp
	src/infoplugins/generic/charts/ChartsPlugin.h
	src/infoplugins/generic/hypem/HypemPlugin.cpp
	src/infoplugins/generic/hypem/HypemPlugin.h
	src/infoplugins/generic/hypemPlugin.cpp
	src/infoplugins/generic/hypemPlugin.h
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/CountryUtils.h
	src/libtomahawk/infosystem/InfoSystemWorker.cpp
	src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp
	src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h
	src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h
	src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp
	src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h
2012-05-18 00:47:32 -04:00
Dominik Schmidt
f9eab019a9 cmake *sigh* 2012-05-17 18:37:34 +02:00
Dominik Schmidt
f33d446f7f Make linux infoplugins real plugins 2012-05-14 05:17:07 +02:00
Dominik Schmidt
9c995270cf minor improvements for add_tomahawk_plugin 2012-05-14 04:16:58 +02:00
Dominik Schmidt
dd4acb0cd2 add_tomahawk_plugin: port googlewrapper account 2012-05-14 03:24:10 +02:00
Dominik Schmidt
102ead74bd Add add_tomahawk_plugin cmake macro 2012-05-14 02:41:02 +02:00