commit | 890d8da2e3588d416ef178e2e74ed3df226a6040 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 25 16:37:30 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 25 16:37:30 2015 +0000 |
tree | 3d024b90830e8afe48f75f0cb741965a5bb76015 | |
parent | 0a2ef2b932f37d54157d82e526a8097caf9143ba [diff] | |
parent | ac8678aefe157d7e40c5bcedd12333eaedf0df92 [diff] |
Merge branch 'obsd-master' Conflicts: log.c proc.c tmux.c