]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b394fc9 b3cfe63)
Merge branch 'master'
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 4 Apr 2017 18:04:07 +0000 (20:04 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 4 Apr 2017 18:04:07 +0000 (20:04 +0200)
1  2 
bgpd/bgpd.c patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history

diff --cc bgpd/bgpd.c
Simple merge
diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.