]> jspc29.x-matter.uni-frankfurt.de Git - soda.git/commit
fixing conflicts
authorJan Michel <j.michel@gsi.de>
Thu, 22 Jan 2015 15:08:31 +0000 (16:08 +0100)
committerJan Michel <j.michel@gsi.de>
Thu, 22 Jan 2015 15:08:31 +0000 (16:08 +0100)
commit2efe15d96cf7535df403f0d66700e6773feeced6
tree9b7f2a602104549a864f7c59947cd3d2250bc299
parent0b8678fe6823a6894545642ff663e51bd2b8c659
parent3de952ebf71a779008f74a6863c2ac8351ef9e6f
fixing conflicts
.gitattribute
code/med_ecp3_sfp_4_sync_down.vhd
code/med_ecp3_sfp_sync_up.vhd
code/soda_components.vhd