clone of nymea from github https://github.com/nymea/
 
 
 
 
 
 
Go to file
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
libhive Merge branch 'master' of https://github.com/HiveFive/Hive 2013-12-31 02:16:02 +01:00
plugins Merge branch 'master' of https://github.com/HiveFive/Hive 2013-12-31 02:16:02 +01:00
server
CMakeLists.txt
Hive.pro