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

..

SMSClient

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

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

Sprinkler

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

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

AbstractNetworkInterface.h

Creation

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

GlobalDefine.h

Creation

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

GuiMain.cpp

Creation

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

GuiMain.h

Creation

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

main.cpp

Creation

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

MasterCtrlInterface.cpp

Creation

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

MasterCtrlInterface.h

Creation

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

NetworkProtocol.cpp

Creation

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

NetworkProtocol.h

Creation

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

ProgramSettings.cpp

Creation

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

ProgramSettings.h

Creation

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

ProtocolDefs.h

Check-in pré-voyage

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

SettingsWindow.cpp

Creation

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

SettingsWindow.h

Creation

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

SystemGui.cpp

Check-in pré-voyage

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

SystemGui.h

Check-in pré-voyage

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

SystemTrayManager.cpp

Creation

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

SystemTrayManager.h

Creation

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

ToggleSwitch.cpp

Check-in pré-voyage

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

ToggleSwitch.h

Check-in pré-voyage

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