Cedric Roux b4a48e199e Merge remote-tracking branch 'origin/update-license' into RU-RAU-split ...

Conflicts:
	openair1/PHY/CODING/rate_matching.c
	openair1/PHY/LTE_REFSIG/primary_synch.h
	openair2/LAYER2/layer2_top.c
	openair2/RRC/LITE/rrc_config.c

2017-10-23 15:00:30 +02:00

..

eth_raw.c

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

eth_udp.c

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

ethernet_lib.c

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

ethernet_lib.h

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

if_defs.h

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

Makefile.inc

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6348 818b1a75-f10b-46b9-bf7c-635c3b92a50f

2015-01-11 18:41:40 +00:00