Conflicts:
	Pcie40Applications/regconfig.cpp

	modified:   Pcie40Applications/regconfig.cpp

-           cur_pos = cur_pos + j;
+           cur_pos = ( cur_pos + j ) % DMASIZE;

* commit 'a36b5ba8':
  remove monitoring of slc fifo
  remove exec files
  remove editting files
  add status of links on statlink
  Remove exec files from git
  add statlink.cpp and timediff.cpp
  add pcie40_op()
  add stream_arich to regconfig

* commit 'f00ba0c1':
  remove monitoring of slc fifo
  remove exec files
  remove editting files
  add status of links on statlink
  48 links for slow control library
  Fix compilation for CentOS8
  Change some log messages.
  Check if the next event's 7f7f magic word and, if not, wait until it appears.
  Modiry the output of pcie40_ul.
  Test other ports
  Debug slow control
  Fix resync function
  Update for 4 link version
  change names of variables
  Add argument to specify the link number
  Improve data checking program

* commit 'd162a14b':
  add statlink.cpp and timediff.cpp
  add pcie40_op()
  add stream_arich to regconfig

Conflicts:
	Pcie40Applications/main_pcie40_b2slc.c
	Pcie40Applications/main_pcie40_ul.c
	Pcie40Libraries/pcie40_b2ecs.c
	Pcie40Libraries/pcie40_b2ecs.h
	Pcie40Libraries/pcie40_b2slc.c
	Pcie40Libraries/pcie40_b2slc.h
	Python/components/fpga_comp.py

7f7f is found. TRAILER f801f803 eve 008812af exprun 00003c00 pos 19473
7f7f is found. TRAILER f80bf80d eve 3c003333 exprun f803f805 pos 20353
7f7f is found. TRAILER f801f803 eve 00881dfb exprun 00003c00 pos 21401

(Very simple version)