commit | 833fe5bdee449b04afe8844774be66374e1baf9c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Feb 06 19:05:56 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Feb 06 19:07:43 2015 +0000 |
tree | 11b21f479421b08f67776c832543becaa0b12fb8 | |
parent | 93c3fb78a3593afd23e85352213236131dd5958f [diff] | |
parent | 313f2263f8bb3336893527f65789f820ba7eaf0f [diff] |
Merge branch 'obsd-master' Conflicts: cmd-pipe-pane.c