]> rtime.felk.cvut.cz Git - orte/eurobot.git/commitdiff
projects / orte / eurobot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 070fc74 7b76a6f)
Merge git://git.code.sf.net/p/orte/orte master
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 15 Nov 2013 16:00:42 +0000 (17:00 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 15 Nov 2013 16:00:42 +0000 (17:00 +0100)

Trivial merge
ORTE branch with fixes for Eurobot project