jfmartel/SystemGui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7 Commits 1 Branch 0 Tags
Commit Graph

1 Commits

Author SHA1 Message Date
J-F Martel
59fd7f5932 Merge branch 'master' of https://bitbucket.org/jfmartel/systemgui 
Conflicts:
	Sources/Sprinkler/SprinklerDevice.cpp
	Sources/Sprinkler/SprinklerDevice.h
	SystemGui.pro
	ui_SprinklerGui.h
 2017-07-18 15:39:05 -04:00