]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commit
fixed conflict
authorCahit <c.ugur@gsi.de>
Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)
committerCahit <c.ugur@gsi.de>
Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)
commitb731cbb8104e7ccd29bd5532d77569529ab41f90
treeaee37ac2b9b1bd4c7a99018b425a88dc00c0d0ef
parentd4f780cdb23b0e27f1813ebb5650d743ed609a2d
parentc1d0fa34a9a4e158d509efe9cfe5f9c5072d358b
fixed conflict
32PinAddOn/config.vhd
32PinAddOn/trb3_periph_32PinAddOn.vhd