CVS commit: src/external/bsd/tmux/dist

["Julio Merino" <jmmv%netbsd.org@localhost>]

Module Name:    src
Committed By:   jmmv
Date:           Wed Aug 17 18:48:37 UTC 2011

Modified Files:
        src/external/bsd/tmux/dist: cmd-paste-buffer.c cmd-server-info.c
            cmd-string.c environ.c input.c job.c options.c screen-write.c
            screen.c server-fn.c session.c tty-acs.c tty-keys.c tty-term.c
            window.c
        src/external/bsd/tmux/dist/compat: imsg-buffer.c imsg.c
Removed Files:
        src/external/bsd/tmux/dist: cmd-copy-buffer.c cmd-generic.c
            cmd-last-pane.c cmd-last-window.c cmd-lock-client.c
            cmd-lock-session.c cmd-next-layout.c cmd-next-window.c
            cmd-previous-layout.c cmd-previous-window.c cmd-set-window-option.c
            cmd-show-window-options.c layout-string.c

Log Message:
Fix merge conflicts after tmux 1.5 import.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/external/bsd/tmux/dist/cmd-copy-buffer.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/tmux/dist/cmd-generic.c \
    src/external/bsd/tmux/dist/cmd-last-pane.c \
    src/external/bsd/tmux/dist/cmd-last-window.c \
    src/external/bsd/tmux/dist/cmd-lock-client.c \
    src/external/bsd/tmux/dist/cmd-lock-session.c \
    src/external/bsd/tmux/dist/cmd-next-layout.c \
    src/external/bsd/tmux/dist/cmd-next-window.c \
    src/external/bsd/tmux/dist/cmd-previous-layout.c \
    src/external/bsd/tmux/dist/cmd-previous-window.c \
    src/external/bsd/tmux/dist/cmd-set-window-option.c \
    src/external/bsd/tmux/dist/cmd-show-window-options.c \
    src/external/bsd/tmux/dist/layout-string.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tmux/dist/cmd-paste-buffer.c \
    src/external/bsd/tmux/dist/cmd-server-info.c \
    src/external/bsd/tmux/dist/cmd-string.c \
    src/external/bsd/tmux/dist/environ.c src/external/bsd/tmux/dist/input.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/tty-acs.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.2 -r1.3 src/external/bsd/tmux/dist/compat/imsg-buffer.c \
    src/external/bsd/tmux/dist/compat/imsg.c

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