Merge: Ronald Gomes from Technologic Systemscontributed support for TS-CAN1 and TS...
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 17 Nov 2005 14:36:00 +0000 (15:36 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 17 Nov 2005 14:36:00 +0000 (15:36 +0100)
commit62c38bb3d6fe5ca4d22fa0e552d4eeeef0e2b61e
tree6e82a55efe6b0ba5bd5111e9ebc978816ee3f8b5
parentf4eab9f1647cee07d82160bd62f5f26db0734fbc
parentbab3604638338226c816d432a768c23726cd918e
Merge: Ronald Gomes from Technologic Systemscontributed support for TS-CAN1 and TS-7KV cards.

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