]> git.ozlabs.org Git - ppp.git/commitdiff
projects / ppp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b05e22 ad993a2)
Merge branch 'master' of git://github.com/cmcqueen/ppp
authorPaul Mackerras <paulus@samba.org>
Fri, 1 Aug 2014 11:41:27 +0000 (21:41 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 1 Aug 2014 11:41:27 +0000 (21:41 +1000)
This merges in one commit, which adds the new "stop-bits" option.

Signed-off-by: Paul Mackerras <paulus@samba.org>
1  2 
pppd/pppd.h patch | diff1 | diff2 | blob | history
pppd/sys-linux.c patch | diff1 | diff2 | blob | history

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