]> rtime.felk.cvut.cz Git - lincan.git/commitdiff
projects / lincan.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16e7fc1 fdda6e9)
Merge branch 'can-usb1' into spican1
authorIng. Jan Kriz <devel@jojen.net>
Mon, 18 Apr 2011 08:26:17 +0000 (10:26 +0200)
committerIng. Jan Kriz <devel@jojen.net>
Mon, 18 Apr 2011 08:26:17 +0000 (10:26 +0200)
Conflicts:
lincan/src/finish.c

1  2 
lincan/include/main.h patch | diff1 | diff2 | blob | history

diff --cc lincan/include/main.h
Simple merge
LinCAN driver development repository