CVS commit: src/external/bsd/tmux

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

Module Name:    src
Committed By:   christos
Date:           Sun Apr 23 02:02:00 UTC 2017

Modified Files:
        src/external/bsd/tmux: README prepare-import.sh
        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-queue.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 notify.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 tty.c utf8.c window-copy.c window.c
            xmalloc.h
        src/external/bsd/tmux/dist/compat: imsg-buffer.c imsg.c
        src/external/bsd/tmux/usr.bin/tmux: Makefile
Added Files:
        src/external/bsd/tmux/usr.bin/tmux: utempter.c utempter.h
Removed Files:
        src/external/bsd/tmux/dist: array.h cmd-clear-history.c mode-key.c
        src/external/bsd/tmux/dist/compat: b64_ntop.c openat.c

Log Message:
merge conflicts
XXX: Does not work; core-dumps!


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tmux/README
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/prepare-import.sh
cvs rdiff -u -r1.1.1.6 -r0 src/external/bsd/tmux/dist/array.h \
    src/external/bsd/tmux/dist/cmd-clear-history.c \
    src/external/bsd/tmux/dist/mode-key.c
cvs rdiff -u -r1.4 -r1.5 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.2 -r1.3 src/external/bsd/tmux/dist/cmd-attach-session.c \
    src/external/bsd/tmux/dist/cmd-new-session.c \
    src/external/bsd/tmux/dist/hooks.c src/external/bsd/tmux/dist/proc.c \
    src/external/bsd/tmux/dist/server-client.c \
    src/external/bsd/tmux/dist/utf8.c src/external/bsd/tmux/dist/xmalloc.h
cvs rdiff -u -r1.5 -r1.6 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.3 -r1.4 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.6 -r1.7 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.1.1.5 -r1.2 src/external/bsd/tmux/dist/cmd-queue.c
cvs rdiff -u -r1.7 -r1.8 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.8 -r1.9 src/external/bsd/tmux/dist/input.c \
    src/external/bsd/tmux/dist/tmux.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tmux/dist/log.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/tmux/dist/notify.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/tmux/dist/tty.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/tmux/dist/compat/b64_ntop.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/compat/imsg-buffer.c \
    src/external/bsd/tmux/dist/compat/imsg.c
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/tmux/dist/compat/openat.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tmux/usr.bin/tmux/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/usr.bin/tmux/utempter.c \
    src/external/bsd/tmux/usr.bin/tmux/utempter.h

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