]> rtime.felk.cvut.cz Git - eurobot/public.git/commit
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
authorroot <root@petr.(none)>
Wed, 24 Mar 2010 21:13:00 +0000 (22:13 +0100)
committerroot <root@petr.(none)>
Wed, 24 Mar 2010 21:13:00 +0000 (22:13 +0100)
commit671de08fe094d4dd5f481052855e7923d748455a
treef65118ad5258b18d9cc02891a88209c8cdf10143
parente50276be80144a1624899376054699eca4ecd8ee
parentd9ca804e3aed89437951f7d971e13e7d29af4db8
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

Conflicts:
src/camera/rozkuk/rozkuk.c
src/camera/rozkuk/rozkuk.c