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

Configuration

Creation

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

Ico

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

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

Sources

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

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

.gitignore

gitignore linux

2017-04-13 10:16:44 -04:00

.qmake.stash

Sprinkler

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

SMSGui.ui

Cleanup

2017-04-13 10:21:29 -04:00

SystemGui.pro

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

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

ui_SMSGui.h

Cleanup

2017-04-13 10:21:29 -04:00

ui_SprinklerGui.h

Check-in pré-voyage

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

Description

No description provided

2.5 MiB

Languages

C++ 98.9%

C 0.7%

QMake 0.4%