diff options
| author | David Lamparter <equinox@diac24.net> | 2017-08-09 13:13:01 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2017-08-09 13:13:01 +0200 |
| commit | 0e236c6cd7bef12a2a375153a0e2d81a961562a2 (patch) | |
| tree | 29fbd9adce8d50fb3183069e57f88f875b73efc0 /lib/libfrr.c | |
| parent | 69965f533aa368b4a630dafbcd72a4f600bd9e1c (diff) | |
| parent | c47b10cae1e0a623589692d6bd8793c2a17ed29a (diff) | |
Merge branch 'stable/3.0' into tmp-3.0-master-merge
Marker (--strategy=ours) merge to record which point in history master
is in sync with related to stable/3.0.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/libfrr.c')
0 files changed, 0 insertions, 0 deletions