Merge branch 'master' into can-usb1
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 16:29:51 +0000 (18:29 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 16:29:51 +0000 (18:29 +0200)
commit3810959545bb02dd92e5ad90531af62e3c985da6
treebbaf16719f7c08106e810f5ac3dc649f1ff87706
parentfe719367cdb25978d42261513dd9810c22481960
parent4dc78b4651f006bf0404c8ec7db85651bcee7c2e
Merge branch 'master' into can-usb1
lincan/src/main.c