Commit Graph

419 Commits

Author SHA1 Message Date
emiliie 81af2bb9b1 Merge branch 'master' of https://github.com/tforgione/Paella
Conflicts:
	Code/compile.bat
2015-02-02 17:02:39 +01:00
emiliie 70c9b9a595 modification conception 2015-02-02 16:51:33 +01:00
emiliie a70b8ad475 new version code 2015-02-02 16:51:13 +01:00
amandinella aa92c978f2 Ajout de la détection de points d'intérêt et de la mise en correspondance et modification du compile.bat 2015-02-02 16:41:44 +01:00
emiliie dedb57d96f conception 2015-02-02 13:47:32 +01:00
Thomas FORGIONE a7c79337f9 Correction d'un bug de portabilité 2015-02-02 11:50:33 +01:00
Thomas FORGIONE 2ace2c33b3 Generic escape on HelloCV 2015-02-02 11:38:51 +01:00
Thomas FORGIONE e114f3c763 Added HelloCV and Calibration 2015-02-02 11:29:03 +01:00
emiliie adca8448ac Finishing translation 2015-01-22 18:15:02 +01:00
amandinella ca8575b429 suppression du lock :) 2015-01-22 15:54:32 +01:00
amandinella 3ec2dfd3d4 affectation des rôles lors des réunions avec le superviseur 2015-01-22 15:51:35 +01:00
amandinella ec2e7d9633 specifications in English 2015-01-22 15:17:58 +01:00
Thomas FORGIONE 561e2e7658 Adding name, and some corrections 2015-01-21 19:12:51 +01:00
Thomas FORGIONE 9bcddf18ee Markdown tables... 2015-01-20 16:26:36 +01:00
Thomas FORGIONE 9bdf2b5118 Markdown syntax for tables, again 2015-01-20 16:03:51 +01:00
Thomas FORGIONE b24e85c663 Conversion of the tables to github's markdown format 2015-01-20 15:58:43 +01:00
Thomas FORGIONE 3717ff3835 Remove Marion's coucou... :-( 2015-01-20 10:48:37 +01:00
Marion Lenfant a2198b18f5 Coucou added in the report ! 2015-01-20 10:33:55 +01:00
Thomas FORGIONE b24234db18 Commit initial 2015-01-20 10:24:55 +01:00