Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Fri, 28 Apr 2017 17:03:41 +0000 (19:03 +0200)
committermirabilos <m@mirbsd.org>
Fri, 28 Apr 2017 17:03:41 +0000 (19:03 +0200)
15 files changed:
1  2 
configure.in
lib/Makefile.am
lib/tempname.c
src/client.c
src/filesubr.c
src/log-buffer.c
src/login.c
src/main.c
src/mkmodules.c
src/parseinfo.c
src/rcs.c
src/rsh-client.c
src/server.c
src/subr.c
src/wrapper.c

diff --cc configure.in
Simple merge
diff --cc lib/Makefile.am
Simple merge
diff --cc lib/tempname.c
Simple merge
diff --cc src/client.c
Simple merge
diff --cc src/filesubr.c
Simple merge
Simple merge
diff --cc src/login.c
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/mkmodules.c
Simple merge
diff --cc src/parseinfo.c
Simple merge
diff --cc src/rcs.c
Simple merge
Simple merge
diff --cc src/server.c
Simple merge
diff --cc src/subr.c
Simple merge
diff --cc src/wrapper.c
Simple merge