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

..

Sprinkler.cpp

Check-in pré-voyage

2017-07-18 15:35:01 -04:00

Sprinkler.h

Check-in pré-voyage

2017-07-18 15:35:01 -04:00

SprinklerDevice.cpp

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

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

SprinklerDevice.h

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

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

SprinklerDeviceGuiItem.cpp

Sprinkler

2017-04-23 10:16:06 -04:00

SprinklerDeviceGuiItem.h

Sprinkler

2017-04-23 10:16:06 -04:00

SprinklerDeviceGuiItem.ui

Sprinkler

2017-04-23 10:16:06 -04:00

SprinklerGui.cpp

Check-in pré-voyage

2017-07-18 15:35:01 -04:00

SprinklerGui.h

Creation

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

SprinklerGui.ui

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

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

SprinklerMasterCtrlInterface.cpp

Check-in pré-voyage

2017-07-18 15:35:01 -04:00

SprinklerMasterCtrlInterface.cpp.autosave

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

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

SprinklerMasterCtrlInterface.h

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

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