Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 1 Mar 2009 10:43:01 +0000 (11:43 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 1 Mar 2009 10:43:01 +0000 (11:43 +0100)
1  2 
lincan/src/main.c

Simple merge