diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-12-08 13:21:21 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-12-08 13:21:21 +0100 |
| commit | d5bd3e0a6f857af84c247ddea52369352c7c97ac (patch) | |
| tree | fa5eb06d42f33bbadb78e70669a0e5569e61407b /ospf6d/ospf6_interface.c | |
| parent | 0276dd5d4bc6a9fdf27ae67558be6d921042405e (diff) | |
| parent | d987f2339d25d32b654dabfe98a40677029575fe (diff) | |
Merge branch 'stable/2.0'
Conflicts:
bgpd/rfapi/bgp_rfapi_cfg.c
bgpd/rfapi/vnc_debug.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_interface.c')
0 files changed, 0 insertions, 0 deletions