commit | da1f6fc2c8477c99e986061bcdd7c3e854a60076 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Oct 27 23:27:26 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Oct 27 23:27:26 2015 +0000 |
tree | f5934e2f96c43f80bad7e3a219230d6337c9d208 | |
parent | 147b5ae5145dc29e9bf4d0ebbc635939b6fdc60b [diff] | |
parent | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile client.c server-client.c server.c tmux.c tmux.h