Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Sat, 12 Aug 2017 01:10:29 +0000 (03:10 +0200)
committermirabilos <m@mirbsd.org>
Sat, 12 Aug 2017 01:10:29 +0000 (03:10 +0200)
commit9496176f5481e8db34852e75aa87d07d0b8798eb
tree693ab091a8935097b346ed6953e7de9b983c25a9
parent459d5868955d103a0482aa35755136e7fbfa0c33
parent5a2cb43fe842070705a510eb8338aa36a137b4a0
Merge branch 'mirbsd'
src/ChangeLog
src/edit.c
src/server.c
src/watch.c