aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'obsd-master'Thomas Adam2014-11-19
|\
| * Label windows which are smaller than expected with a reason.nicm2014-11-14
| * Restore change in r1.17 but add checks to prevent the line lengthnicm2014-11-12
| * Add -b to splitw like joinw, from Felix Rosencrantz.nicm2014-11-12
* | Merge branch 'obsd-master'Thomas Adam2014-11-12
|\|
| * Don't let force-width or force-height be < PANE_MINIMUM.nicm2014-11-12
| * Revert r1.17 as it breaks inserting in some cases.nicm2014-11-10
| * Expand formats in copy-pipe command, suggested by Suraj N Kurapati.nicm2014-11-09
* | Merge branch 'obsd-master'Thomas Adam2014-11-09
|\|
| * Two improvements to reflow from Balazs Kezes:nicm2014-11-08
| * Empty strings should be false too for #{?}, from Marc Finet.nicm2014-11-08
| * V should be vi not emacs, also sort. From Theo Buehler.nicm2014-11-07
| * Wrap when copy mode is used for output, from Balazs Kezes.nicm2014-11-06
| * Add V for select line with vi(1) keys. From Juho Pohjala.nicm2014-11-06
| * Tidy up mode-mouse check.nicm2014-11-05
| * Do not put a space between status-left/status-right and the window list,nicm2014-11-05
* | No need for $Id$ now.Nicholas Marriott2014-11-08
* | +.Nicholas Marriott2014-11-06
* | Use KERN_PROC_CWD if supported, from Tiwei Bie.Nicholas Marriott2014-11-06
* | Use -a for terminal-overrides from Daniel Hahler.Nicholas Marriott2014-11-06
* | Merge branch 'obsd-master'Thomas Adam2014-10-29
|\|
| * Merge linkw and movew which are virtually identical.nicm2014-10-27
| * Move cfg_causes local into cfg.c and remove struct causelist.nicm2014-10-27
| * Add pane_input_off format, from Anish R Athalye.nicm2014-10-25
| * Fix some spacing nits.nicm2014-10-22
| * Merge unlink-window into kill-window.nicm2014-10-22
| * Only redraw pane when it has actually changed.nicm2014-10-21
| * Save next item after firing command in case it has added to the queue.nicm2014-10-21
* | Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeNicholas Marriott2014-10-21
|\ \
| * \ Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeThomas Adam2014-10-21
| |\ \
| | * \ Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeThomas Adam2014-10-16
| | |\ \
| | * | | OSdep: Update for xrealloc() changeThomas Adam2014-10-16
| | * | | Merge branch 'obsd-master'Thomas Adam2014-10-16
| | |\ \ \
| * | \ \ \ Merge branch 'obsd-master'Thomas Adam2014-10-21
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Better format for printf format attributes.nicm2014-10-20
| | * | | Move template defines back into .c files.nicm2014-10-20
| | * | | Tidy up some includes.nicm2014-10-20
| | * | | Move suspend-client code into detach-client.nicm2014-10-20
| | * | | Argh, meant to remove this file...nicm2014-10-20
| | * | | Move list-commands into list-keys.nicm2014-10-20
| | * | | Missed a couple of cmd_entry struct members from previous.nicm2014-10-20
| | * | | Instead of setting up the default keys by building the key structnicm2014-10-20
| | * | | Fix description of Ss and Se.nicm2014-10-18
| | | |/ | | |/|
| | * | Add xreallocarray and remove nmemb argument from xrealloc.nicm2014-10-08
| | * | Use xrealloc(NULL, n, m) instead of xmalloc(n * m) to get overflownicm2014-10-08
| | * | Top function key is F12 now.nicm2014-10-02
| | * | Take account of window-status-separator when checking window position,nicm2014-10-02
| | * | Update status when pane selected with mouse, from Balazs Kezes.nicm2014-10-02
| | * | Copy ACS characters as UTF-8, from Balazs Kezes.nicm2014-10-02
| | * | Call waitpid on SIGCHLD even if client not attached, it is possible (onnicm2014-10-01