Merge branch 'mpr_rework'
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 7 Apr 2017 06:10:07 +0000 (08:10 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 7 Apr 2017 06:10:07 +0000 (08:10 +0200)
commit1f09357511931d431f5789b71de3d4d881afba11
tree3357108a0fe3d5d13142373b5685526dc9a127fe
parent47952e6acf025f2b22e5c4c11e609d6cd9796e8e
parent4b88b5592a6e003c303e9d59ca87ce88c2dfa8b4
Merge branch 'mpr_rework'
14 files changed:
src-plugins/nhdp/constant_metric/constant_metric.c
src-plugins/nhdp/ff_dat_metric/ff_dat_metric.c
src-plugins/nhdp/mpr/mpr.c
src-plugins/nhdp/mpr/neighbor-graph-flooding.c
src-plugins/nhdp/mpr/neighbor-graph-routing.c
src-plugins/nhdp/nhdp/nhdp_db.c
src-plugins/nhdp/nhdp/nhdp_reader.c
src-plugins/nhdp/nhdp/nhdp_writer.c
src-plugins/olsrv2/netjsoninfo/netjsoninfo.c
src-plugins/olsrv2/olsrv2/olsrv2.c
src-plugins/olsrv2/olsrv2/olsrv2_reader.c
src-plugins/olsrv2/olsrv2/olsrv2_routing.c
src-plugins/olsrv2/olsrv2/olsrv2_writer.c
src-plugins/subsystems/oonf_class.h