]> rtime.felk.cvut.cz Git - eurobot/public.git/commit
projects / eurobot / public.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitddf3d017fc127b0178fd3db187042b9a96c25f26
tree8e12d66f26d4c5c11fd59b292009e45ae6118c12tree | snapshot
parent6b6628d4914fc0fa15e24dde47b252f5dd21b99ccommit | diff
parent110edb99ba01bee7374133064100572e4b1581a2commit | diff
Merge branch 'shapedet'

Conflicts:
src/robofsm/map_handling.c

Conflict solved. We are testing shapedet for homologation.
src/robofsm/Makefile.omk diff1 | diff2 | blob | history
Robotic team Flamingos [formerly CTU Dragons] - main SW repository