jfmartel/SystemGui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30 Commits 1 Branch 0 Tags
master
Commit Graph
16 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
J-F Martel b3245e769d Bon... 2017-07-19 10:45:07 -04:00
J-F Martel aa753396c3 Merge branch 'master' into NewTEst 2017-07-19 10:36:57 -04:00
J-F Martel 0564fb1005 ffffffffffffuuuuuuuu 2017-07-19 10:36:39 -04:00
J-F Martel 84aea0c971 sais pu... 2017-07-19 10:07:34 -04:00
J-F Martel 510cd7713a On va l'avoir... 2017-07-19 10:00:03 -04:00
J-F Martel 04b9f04c06 Merge branch 'develop' 
Conflicts:
	ui_SprinklerGui.h
 2017-07-19 09:32:45 -04:00
J-F Martel 0376216d9d add ui_ files to index 2017-07-19 09:30:28 -04:00
J-F Martel 0558d7ebe4 Merge branch 'master' into fuckup 2017-07-19 09:24:05 -04:00
J-F Martel e98c415226 tentative de réparer le fuck-up 2017-07-19 09:11:25 -04:00
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