From: Michal Vokac <vokac.m@gmail.com>
Date: Fri, 6 May 2011 11:27:50 +0000 (+0200)
Subject: Merge branch 'shapedet'
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/ddf3d017fc127b0178fd3db187042b9a96c25f26

Merge branch 'shapedet'

Conflicts:
	src/robofsm/map_handling.c

Conflict solved. We are testing shapedet for homologation.
---

ddf3d017fc127b0178fd3db187042b9a96c25f26