]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
projects / lisovros / linux_canprio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4775184 c44e184)
Merge remote branch 'shark/cangw-test-36' into cangw-test-36
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 6 Dec 2010 00:21:07 +0000 (01:21 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 6 Dec 2010 00:21:37 +0000 (01:21 +0100)
Replace this branch with a new version (git merge -s ours)


Trivial merge
CAN classifier for Linux Traffic Control