]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
projects / eurobot / public.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 545333d c96aca4)
Merge branch 'omk-fix'
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 16 Oct 2012 02:43:07 +0000 (04:43 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 16 Oct 2012 02:43:07 +0000 (04:43 +0200)

Trivial merge
Robotic team Flamingos [formerly CTU Dragons] - main SW repository