Merge commit 'develop' into feature-127-protocol-split

* remove a lot of white spaces
* many conflicts in enb_config.c
This commit is contained in:
Robert Schmidt
2018-11-07 16:07:59 +01:00
246 changed files with 16448 additions and 9003 deletions
+1 -1
View File
@@ -678,7 +678,7 @@ install_asn1c_from_source(){
# better to use a given commit than a branch in case the branch
# is updated and requires modifications in the source of OAI
#git checkout velichkov_s1ap_plus_option_group
git checkout 73d6b23dcec9ab36605b4af884143824392134c1
git checkout d3aed06bb2bec7df1b5c6d0333f8c7dfc5993372
autoreconf -iv
./configure
make -j`nproc`