summaryrefslogtreecommitdiff
path: root/eurobot/2012
diff options
context:
space:
mode:
authorNicolas Schodet2012-03-21 00:46:03 +0100
committerNicolas Schodet2012-03-21 18:56:51 +0100
commit1e7c8a8a9811c45091e6c471482086113f059f40 (patch)
treed7faa80dd162799c394ec23925cc53b6dbff008e /eurobot/2012
parent0feb542a8cf7630a5d442387727414f5251aad83 (diff)
parentdcb79f383269440ec2c5a54b6d7792fbb0110d5a (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/aux.c digital/mimot/src/dirty/aux.h digital/mimot/src/dirty/contacts.h digital/mimot/src/dirty/main.c digital/mimot/src/dirty/models.host.c digital/mimot/src/dirty/twi_proto.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'eurobot/2012')
-rw-r--r--eurobot/2012/E2012_Rules-EN.pdfbin0 -> 1567643 bytes
-rw-r--r--eurobot/2012/planete-sciences/dossier_projet_2012.odtbin0 -> 577262 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/eurobot/2012/E2012_Rules-EN.pdf b/eurobot/2012/E2012_Rules-EN.pdf
new file mode 100644
index 00000000..265bc750
--- /dev/null
+++ b/eurobot/2012/E2012_Rules-EN.pdf
Binary files differ
diff --git a/eurobot/2012/planete-sciences/dossier_projet_2012.odt b/eurobot/2012/planete-sciences/dossier_projet_2012.odt
new file mode 100644
index 00000000..a9cbe10a
--- /dev/null
+++ b/eurobot/2012/planete-sciences/dossier_projet_2012.odt
Binary files differ