]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ad8ae5 799522a)
Merge remote-tracking branch 'origin/stable/2.0'
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 6 Jan 2017 17:48:32 +0000 (12:48 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 6 Jan 2017 17:48:32 +0000 (12:48 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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