Merge: C_CAN changes
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 2 Jun 2005 10:58:00 +0000 (12:58 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 2 Jun 2005 10:58:00 +0000 (12:58 +0200)
commitb42e8d0483347f6eeca77784b8f0314536031ab6
tree530b3d12bf40110925b14fb2d739487de5109339
parentf22d7bfe6dc6b34be79f62fd3a71001cf9ce2ae2
parente8a319104a2ef2df5b920950a15b1e39bfe3fad0
Merge: C_CAN changes

Merge commit 'remotes/sf-ocera-lincan/master'