CVS commit: src/external/bsd/tmux

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Wed Aug 31 09:33:20 UTC 2016

Modified Files:
        src/external/bsd/tmux/dist: client.c cmd-attach-session.c
            cmd-capture-pane.c cmd-display-message.c cmd-if-shell.c
            cmd-load-buffer.c cmd-new-session.c cmd-new-window.c
            cmd-paste-buffer.c cmd-send-keys.c cmd-show-messages.c
            cmd-split-window.c cmd-string.c cmd-wait-for.c colour.c environ.c
            format.c grid.c hooks.c input-keys.c input.c job.c key-bindings.c
            log.c options.c paste.c proc.c screen-write.c screen.c
            server-client.c server-fn.c session.c status.c tmux.1 tmux.c tmux.h
            tty-acs.c tty-keys.c tty-term.c utf8.c window-copy.c window.c
        src/external/bsd/tmux/usr.bin/tmux: Makefile
Removed Files:
        src/external/bsd/tmux/dist: grid-cell.c
        src/external/bsd/tmux/dist/examples: bash_completion_tmux.sh
            h-boetes.conf n-marriott.conf screen-keys.conf t-williams.conf
            tmux.vim vim-keys.conf xterm-keys.vim

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tmux/dist/client.c \
    src/external/bsd/tmux/dist/cmd-capture-pane.c \
    src/external/bsd/tmux/dist/cmd-send-keys.c \
    src/external/bsd/tmux/dist/cmd-show-messages.c \
    src/external/bsd/tmux/dist/cmd-wait-for.c \
    src/external/bsd/tmux/dist/grid.c src/external/bsd/tmux/dist/status.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/tmux/dist/cmd-attach-session.c \
    src/external/bsd/tmux/dist/cmd-new-session.c \
    src/external/bsd/tmux/dist/server-client.c \
    src/external/bsd/tmux/dist/utf8.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/cmd-display-message.c \
    src/external/bsd/tmux/dist/cmd-if-shell.c \
    src/external/bsd/tmux/dist/format.c \
    src/external/bsd/tmux/dist/input-keys.c src/external/bsd/tmux/dist/tmux.c \
    src/external/bsd/tmux/dist/window-copy.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tmux/dist/cmd-load-buffer.c \
    src/external/bsd/tmux/dist/cmd-new-window.c \
    src/external/bsd/tmux/dist/cmd-split-window.c \
    src/external/bsd/tmux/dist/key-bindings.c \
    src/external/bsd/tmux/dist/paste.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tmux/dist/cmd-paste-buffer.c \
    src/external/bsd/tmux/dist/colour.c src/external/bsd/tmux/dist/environ.c \
    src/external/bsd/tmux/dist/job.c src/external/bsd/tmux/dist/options.c \
    src/external/bsd/tmux/dist/screen-write.c \
    src/external/bsd/tmux/dist/screen.c \
    src/external/bsd/tmux/dist/server-fn.c \
    src/external/bsd/tmux/dist/session.c src/external/bsd/tmux/dist/tmux.1 \
    src/external/bsd/tmux/dist/tty-acs.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/cmd-string.c \
    src/external/bsd/tmux/dist/tty-keys.c \
    src/external/bsd/tmux/dist/tty-term.c src/external/bsd/tmux/dist/window.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/tmux/dist/grid-cell.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tmux/dist/hooks.c \
    src/external/bsd/tmux/dist/proc.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/input.c \
    src/external/bsd/tmux/dist/tmux.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tmux/dist/log.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/tmux/dist/examples/bash_completion_tmux.sh
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/tmux/dist/examples/h-boetes.conf \
    src/external/bsd/tmux/dist/examples/n-marriott.conf \
    src/external/bsd/tmux/dist/examples/t-williams.conf \
    src/external/bsd/tmux/dist/examples/vim-keys.conf
cvs rdiff -u -r1.1.1.4 -r0 \
    src/external/bsd/tmux/dist/examples/screen-keys.conf
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/tmux/dist/examples/tmux.vim
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/tmux/dist/examples/xterm-keys.vim
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/tmux/usr.bin/tmux/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.