diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-14 11:38:30 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-14 11:38:30 +0000 |
| commit | 7b749eff3510ccf173c029a92c266e91454ce600 (patch) | |
| tree | 8194d8dcf4d3364360960c741a3266cb9a9d7101 /cmd-join-pane.c | |
| parent | 23266e8e095fb590543d309ae3c8e30fcd98d6b7 (diff) | |
| parent | c56b81a2ce815f6d289232f20bb6e07cfd0e36ec (diff) | |
Merge branch 'obsd-master'
Conflicts:
server.c
tmux.c
Diffstat (limited to 'cmd-join-pane.c')
0 files changed, 0 insertions, 0 deletions