]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge branch 'frr/pull/240' ("lib, bgpd: clean up headers")
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 7 Mar 2017 15:03:36 +0000 (16:03 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 7 Mar 2017 15:03:36 +0000 (16:03 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
1  2 
bgpd/bgp_main.c
bgpd/bgpd.h

diff --cc bgpd/bgp_main.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge