]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
projects / eurobot / public.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b6628d 110edb9)
Merge branch 'shapedet'
authorMichal Vokac <vokac.m@gmail.com>
Fri, 6 May 2011 11:27:50 +0000 (13:27 +0200)
committerMichal Vokac <vokac.m@gmail.com>
Fri, 6 May 2011 11:27:50 +0000 (13:27 +0200)
Conflicts:
src/robofsm/map_handling.c

Conflict solved. We are testing shapedet for homologation.

1  2 
src/robofsm/Makefile.omk patch | diff1 | diff2 | blob | history

diff --cc src/robofsm/Makefile.omk
Simple merge
Robotic team Flamingos [formerly CTU Dragons] - main SW repository