Merge branch 'master' of https://bitbucket.org/jfmartel/systemgui

Browse Source

Conflicts:
	Sources/Sprinkler/SprinklerDevice.cpp
	Sources/Sprinkler/SprinklerDevice.h
	SystemGui.pro
	ui_SprinklerGui.h

...

This commit is contained in:

J-F Martel

2017-07-18 15:39:05 -04:00

parent f6dffb12ca 2c22dda0f4

commit 59fd7f5932

13 changed files with 304 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Ico/switch-off-icon.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 37 KiB

Ico/switch-on-icon.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 37 KiB