Adrian Costina 977d9d0624 Merge branch 'hdl_2015_r2' into dev ... Conflicts: projects/daq1/common/daq1_spi.v		2016-03-02 13:52:15 +02:00
..
daq1_bd.tcl	daq1: ADC DMA must be in none-cyclic mode	2016-02-24 14:37:19 +02:00
daq1_spi.v	Merge branch 'hdl_2015_r2' into dev	2016-03-02 13:52:15 +02:00