Merge branch 'develop' into staging staging
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 15 May 2018 06:37:09 +0000 (08:37 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 15 May 2018 06:37:09 +0000 (08:37 +0200)
commitd7d69064311b081b5a501e0849240736935ac943
treec02eccf09b626cc62b19861fe5c1363f07c725ef
parentf1a30ade98b9f2e51297f89af7041ae888174e57
parent5274ce6a589ea2ceab53f2190f8232498695a90f
Merge branch 'develop' into staging
34 files changed:
apps/dlep-radio/CMakeLists.txt
apps/dlep-router/CMakeLists.txt
apps/olsrd2-dlep/CMakeLists.txt
apps/olsrd2/CMakeLists.txt
include/oonf/base/oonf_layer2.h
include/oonf/generic/dlep/dlep_session.h
include/oonf/generic/dlep/radio/dlep_radio_session.h
include/oonf/generic/layer2_export/layer2_export.h
include/oonf/generic/layer2_import/layer2_import.h
include/oonf/libcommon/netaddr.h
include/oonf/nhdp/nhdp/nhdp_domain.h
include/oonf/olsrv2/olsrv2_l2import/olsrv2_l2import.h
src/base/oonf_layer2.c
src/generic/CMakeLists.txt
src/generic/dlep/dlep_session.c
src/generic/dlep/dlep_writer.c
src/generic/dlep/ext_base_ip/ip.c
src/generic/dlep/ext_lid/lid.c
src/generic/dlep/radio/dlep_radio.c
src/generic/dlep/router/dlep_router.c
src/generic/layer2_export/CMakeLists.txt
src/generic/layer2_export/layer2_export.c
src/generic/layer2_export/olsrv2_l2import.c
src/generic/layer2_generator/layer2_generator.c
src/generic/layer2_import/CMakeLists.txt
src/generic/layer2_import/lan_import.c
src/generic/layer2_import/layer2_import.c
src/generic/layer2info/layer2info.c
src/generic/nl80211_listener/nl80211_get_station_dump.c
src/libcommon/netaddr.c
src/nhdp/nhdp/nhdp_domain.c
src/olsrv2/CMakeLists.txt
src/olsrv2/olsrv2_l2import/CMakeLists.txt
src/olsrv2/olsrv2_l2import/olsrv2_l2import.c