MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
Conflicts:
	.gitignore
	libraries/MySensors/MyGateway.cpp
	libraries/MySensors/MyMQTT.cpp
	libraries/MySensors/MyMQTT.h
	libraries/MySensors/examples/MQTTGateway/MQTTGateway.ino
This commit is contained in:
Henrik Ekblad
2015-04-01 01:17:51 +02:00
parent 410a8869cb c0dee158df
commit 082cb29e8d
18 changed files with 1869 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -1 +1,3 @@
stino.settings
*~
*bak