Xiwen JIANG 033513034f Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7 ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_config.c

2016-11-18 16:58:31 +01:00

..

enb_app.c

add licensing info at top of source files

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

enb_app.h

add licensing info at top of source files

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

enb_config.c

Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7

2016-11-18 16:58:31 +01:00

enb_config.h

merge from develop

2016-10-11 18:52:14 +02:00

Makefile.inc

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

2014-08-21 11:51:05 +00:00