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

37 KiB

1024x1024px

Raw History