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 |
|
J-F Martel
|
f6dffb12ca
|
Check-in pré-voyage
|
2017-07-18 15:35:01 -04:00 |
|
Jean-Francois Martel
|
2c22dda0f4
|
Sprinkler
|
2017-04-23 10:16:06 -04:00 |
|
J-F Martel
|
46d6d4ac05
|
Merge branch 'master' of https://bitbucket.org/jfmartel/systemgui
|
2017-04-13 10:22:26 -04:00 |
|
J-F Martel
|
fa592bc5ed
|
Cleanup
|
2017-04-13 10:21:29 -04:00 |
|
Jean-Francois Martel
|
e3a93324b5
|
gitignore linux
|
2017-04-13 10:16:44 -04:00 |
|
J-F Martel
|
9f5b83c776
|
Creation
|
2017-04-12 13:37:09 -04:00 |
|