aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-10-31 23:56:35 +0000
committerThomas Adam <thomas@xteddy.org>2015-10-31 23:56:35 +0000
commitc975de2e07bdb21c85fc4f2c14a17bc00ca63aff (patch)
tree70ff97109da24dc7273b59df6ef6a9f298e16c48 /tmux.c
parent17f6c3be8eeb0b67d07f916026dab918795c0317 (diff)
parentba7fb49fb9b972a03547381783abe91be3fcfa37 (diff)
downloadrtmux-c975de2e07bdb21c85fc4f2c14a17bc00ca63aff.tar.gz
rtmux-c975de2e07bdb21c85fc4f2c14a17bc00ca63aff.tar.bz2
rtmux-c975de2e07bdb21c85fc4f2c14a17bc00ca63aff.zip
Merge branch 'obsd-master'
Conflicts: server.c
Diffstat (limited to 'tmux.c')
0 files changed, 0 insertions, 0 deletions