diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-08-09 15:07:18 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-08-09 15:07:18 +0100 |
commit | 27c385210328bdae9566a77e8cfe4039ff91923b (patch) | |
tree | 48553549dd86ef6285ce4c1153a7ddd25c3810a4 /options.c | |
parent | 237b7a50f479a104571c59691f145ac902d4023e (diff) | |
parent | 5dd5543fe42d4d485b9020f3ce8b8d4d47d29001 (diff) | |
download | rtmux-27c385210328bdae9566a77e8cfe4039ff91923b.tar.gz rtmux-27c385210328bdae9566a77e8cfe4039ff91923b.tar.bz2 rtmux-27c385210328bdae9566a77e8cfe4039ff91923b.zip |
Merge branch 'obsd-master'
Conflicts:
tmux.1
Diffstat (limited to 'options.c')
0 files changed, 0 insertions, 0 deletions