Merge remote-tracking branch 'origin/develop' into feature-68-RRC

Conflicts: openair2/ENB_APP/flexran_agent_common.c
2017-04-11 09:12:04 +00:00
parent 14fb9e2ba2 38abafed2e
commit 1603d3674d
65 changed files with 3538 additions and 1256 deletions
@@ -426,7 +426,6 @@ int flexran_agent_destroy_agent_reconfiguration(Protocol__FlexranMessage *msg) {
 }


-
 int flexran_agent_lc_config_reply(mid_t mod_id, const void *params, Protocol__FlexranMessage **msg) {

  xid_t xid;