Michael Zanetti 46b750e6e3 Merge branch 'master' of https://github.com/HiveFive/Hive ... Conflicts: plugins/deviceplugins/rfswitch/rfswitch.cpp		2013-12-31 02:16:02 +01:00
..
rfswitch	Merge branch 'master' of https://github.com/HiveFive/Hive	2013-12-31 02:16:02 +01:00
deviceplugins.pro	added plugin interface for deviceplugins. so far only static plugins	2013-12-30 21:37:41 +01:00