maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,723 Commits 5 Branches 0 Tags
e71aebc603af444b790fec71cef8dc808bae66f4
Commit Graph
5 Commits
Author SHA1 Message Date
Raymond Knopp e71aebc603 Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling 
Conflicts:
	openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/openair2_proc.c
	openair2/RRC/LITE/rrc_eNB.c
	openair3/NAS/UE/API/USIM/usim_api.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
 2016-03-31 14:36:12 -07:00
Cedric Roux 20b6fee632 remove more warnings 2016-03-27 13:36:37 +02:00
Cedric Roux 77363df00b remove #warning lines (comment them out) 2016-03-26 22:52:19 +01:00
Aikaterini 8f0ac37eda modifications in UE NAS to allow OAI UE to connect to. Note this is hard-coded in NAS, it will no longer work with openairCN. To be fixed before merging into develop branch 
.
 2016-03-02 20:58:20 +01:00
gauthier 7b5431a62c renamed openair-cn to openair3 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7886 818b1a75-f10b-46b9-bf7c-635c3b92a50f
 2015-10-06 16:53:42 +00:00