Bertrand BRUN 2bb1daba14 Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable ... Conflicts: presentation/presentation.tex		2011-05-23 17:31:47 +02:00
..
img	Ajout d'une image manquante	2011-05-23 08:08:49 +02:00
.gitignore	Corrections sur le rapport.	2011-05-21 18:15:04 +02:00
presentation.tex	Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable	2011-05-23 17:31:47 +02:00