hardy c4745c3e46 Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15 ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h

2021-04-14 14:56:04 +02:00

..

itti_sim.c

Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15

2021-04-14 14:56:04 +02:00