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

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

2016-11-17 16:36:22 +01:00

..

enb_app.c

Merge remote-tracking branch 'origin/develop' into enhancement-16-tm_rrc_reconfig

2016-08-30 15:53:46 +02:00

enb_app.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

enb_config.c

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

2016-11-17 16:36:22 +01:00

enb_config.h

add tm7 case into asn1 message

2016-07-01 13:48:10 +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