]> jspc29.x-matter.uni-frankfurt.de Git - dirich.git/commit
solved conflicts
authorCahit <c.ugur@gsi.de>
Tue, 25 Apr 2017 19:35:27 +0000 (21:35 +0200)
committerCahit <c.ugur@gsi.de>
Tue, 25 Apr 2017 19:35:27 +0000 (21:35 +0200)
commit78113a065340a3b3ff08a6c3261bb5e69b44de0b
treec078a3d0ab6541ea44c5f2ce903da6963f81be3e
parent67906ab466887859cd0b6e9ff01c2fc542847cd9
parente6feea66cb86bddfb22ba13a41c815e3e6e68f93
solved conflicts
dirich/config.vhd
dirich/dirich.vhd