Merge branch 'cbm_cri'

author Thomas Gessler <Thomas.Gessler@exp2.physik.uni-giessen.de>

Wed, 5 Aug 2020 14:59:16 +0000 (16:59 +0200)

committer Thomas Gessler <Thomas.Gessler@exp2.physik.uni-giessen.de>

Wed, 5 Aug 2020 14:59:16 +0000 (16:59 +0200)
author Thomas Gessler <Thomas.Gessler@exp2.physik.uni-giessen.de>
Wed, 5 Aug 2020 14:59:16 +0000 (16:59 +0200)
committer Thomas Gessler <Thomas.Gessler@exp2.physik.uni-giessen.de>
Wed, 5 Aug 2020 14:59:16 +0000 (16:59 +0200)
diff --cc trb_net16_endpoint_hades_full.vhd
Simple merge
diff --cc trb_net16_endpoint_hades_full_handler_record.vhd
Simple merge
diff --cc trb_net_components.vhd
Simple merge
author	Thomas Gessler <Thomas.Gessler@exp2.physik.uni-giessen.de>
	Wed, 5 Aug 2020 14:59:16 +0000 (16:59 +0200)
committer	Thomas Gessler <Thomas.Gessler@exp2.physik.uni-giessen.de>
	Wed, 5 Aug 2020 14:59:16 +0000 (16:59 +0200)
		1	2
trb_net16_endpoint_hades_full.vhd	patch \|	diff1 \|	diff2 \|	blob \| history
trb_net16_endpoint_hades_full_handler_record.vhd	patch \|	diff1 \|	diff2 \|	blob \| history
trb_net_components.vhd	patch \|	diff1 \|	diff2 \|	blob \| history