]> rtime.felk.cvut.cz Git - eurobot/public.git/commit
Merge remote-tracking branch 'origin/sick-day' into sick-day
authorMichal Vokac <vokac.m@gmail.com>
Fri, 12 Oct 2012 07:53:04 +0000 (09:53 +0200)
committerMichal Vokac <vokac.m@gmail.com>
Fri, 12 Oct 2012 07:53:04 +0000 (09:53 +0200)
commit98ac2d100baadb14ae2cbe5182bdc3f9ac3d59b3
treed4ddde30e894441c9accde87cf0930860616447b
parent7a2a5a2a238c6e41d51fa63ebede314009218b14
parentec1c7a3ef87565d215b0c972edcdf882c3602a98
Merge remote-tracking branch 'origin/sick-day' into sick-day

Solved conflicts:
build/gumstix/config.target
build/gumstix/qt/linux-omap3-g++/qmake.conf
src/camera/color-finder/main/Makefile.omk
build/gumstix/qt/linux-omap3-g++/qmake.conf