]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 867f76c f6ee5b5)
Merge branch 'stable/2.0'
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 18:26:28 +0000 (19:26 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 18:26:28 +0000 (19:26 +0100)
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.