hbilel 31fbc80520 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B ...

parent a6742020 - Commit 1fa2f76e61

Conflicts:
	targets/RT/USER/lte-softmodem.c

2016-10-24 16:21:05 +02:00

..

Makefile

update licensing information in remaining files

2016-09-28 11:17:33 +02:00

network.h

add licensing info at top of source files

2016-09-27 16:54:39 +02:00

ue_data.c

add licensing info at top of source files

2016-09-27 16:54:39 +02:00

usim_data.c

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B

2016-10-24 16:21:05 +02:00