]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
projects / eurobot / public.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56138e4 65a3eac)
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
authorMartin Zidek <zidekm1@gmail.com>
Fri, 18 Apr 2008 20:46:27 +0000 (22:46 +0200)
committerMartin Zidek <martin@martinzidek.com>
Fri, 18 Apr 2008 20:46:27 +0000 (22:46 +0200)

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