]> git.ozlabs.org Git - ppp.git/commitdiff
projects / ppp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31dd726 66ae569)
Merge branch 'master' of https://github.com/gburgessiv/ppp
authorPaul Mackerras <paulus@ozlabs.org>
Sat, 18 Mar 2017 11:24:25 +0000 (22:24 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Sat, 18 Mar 2017 11:24:25 +0000 (22:24 +1100)
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
1  2 
pppd/main.c patch | diff1 | diff2 | blob | history

diff --cc pppd/main.c
Simple merge
PPP (Point-to-Point Protocol) implementation for Linux and Solaris