]> rtime.felk.cvut.cz Git - orte/eurobot.git/commitdiff
projects / orte / eurobot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dcbee7 270c0ba)
Merge branch 'master' of ssh://git.code.sf.net/p/orte/orte
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 14 Sep 2013 17:16:45 +0000 (19:16 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 14 Sep 2013 17:16:45 +0000 (19:16 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
ORTE branch with fixes for Eurobot project