commit | 562af864bd8ab06c416075b5742ce3bbcf6d0610 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Oct 21 07:11:44 2014 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Oct 21 07:11:44 2014 +0100 |
tree | 2c3900dd6b284aa52441c3fde9dfdf8383d87b54 | |
parent | b6aef2490f086f3404f439308bb1746ec5134e9a [diff] | |
parent | 0a1a88d63caf3a0e8b4440686e73e1f0f690e03c [diff] |
Merge branch 'obsd-master' Conflicts: Makefile cmd-list-commands.c cmd-suspend-client.c job.c tmux.h xmalloc.c