]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
projects / eurobot / public.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0ab6c9 e6eb963)
Merge branch 'sick-day' into update
authorMichal Vokac <vokac.m@gmail.com>
Mon, 1 Oct 2012 22:27:28 +0000 (00:27 +0200)
committerMichal Vokac <vokac.m@gmail.com>
Mon, 1 Oct 2012 22:27:28 +0000 (00:27 +0200)

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