Merge branch 'master' into mpr_rework
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 22 Jul 2016 10:58:07 +0000 (12:58 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 22 Jul 2016 10:58:07 +0000 (12:58 +0200)
commitc8329ffb5fb97ade061aeea674e02152835b257e
treec31bef4bd971371f333e62760778db06ba8d80be
parent5b7bb58a9edc79206b51d142f388a941e37769ab
parentb0f8d180b2b164ebfa731481ec7e70bc6415ff7b
Merge branch 'master' into mpr_rework
12 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/nhdp/nhdp_db.c
src-plugins/nhdp/nhdp/nhdp_domain.c
src-plugins/nhdp/nhdp/nhdp_domain.h
src-plugins/nhdp/nhdp/nhdp_reader.c
src-plugins/olsrv2/olsrv2/olsrv2.c
src-plugins/olsrv2/olsrv2/olsrv2.h
src-plugins/olsrv2/olsrv2/olsrv2_routing.c
src-plugins/olsrv2/olsrv2/olsrv2_writer.c
src-plugins/subsystems/os_linux/os_fd_linux.h