]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97369f2 074d080)
Merge remote-tracking branch 'frr/dev/7.0' into 7.0-kill-backports
authorDavid Lamparter <equinox@diac24.net>
Tue, 19 Feb 2019 13:22:59 +0000 (14:22 +0100)
committerDavid Lamparter <equinox@diac24.net>
Tue, 19 Feb 2019 13:22:59 +0000 (14:22 +0100)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.