]> rtime.felk.cvut.cz Git - eurobot/public.git/commit
projects / eurobot / public.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bab5340 527e8bf)
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)
commit1b4e6e5f260ddf67f9ade58f07714dad4edf32b3
treef4afe2e46e8d963874a96a23ca5d538ee75aa757tree | snapshot
parentbab5340445b5d2d15eb602ad76d129d2fda728e6commit | diff
parent527e8bf4ff606f50975aec2e9a5960ef18d0985dcommit | 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