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

..

back.png

Creation

2017-04-12 13:37:09 -04:00

close.png

Creation

2017-04-12 13:37:09 -04:00

contact.png

Creation

2017-04-12 13:37:09 -04:00

icon.png

Creation

2017-04-12 13:37:09 -04:00

sms_new.png

Creation

2017-04-12 13:37:09 -04:00

sms.png

Creation

2017-04-12 13:37:09 -04:00

switch-off-icon.png

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

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

switch-on-icon.png

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

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