aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'obsd-master'Thomas Adam2015-10-27
|\
| * Count brackets in #{?...} so that nested conditional formats work, fromnicm2015-10-27
| * The format callback may not always succeed, so we need to check fornicm2015-10-27
| * Use copy-mode -et= in WheelUpPane binding, from Patrick Palka.nicm2015-10-27
* | Merge branch 'obsd-master'Thomas Adam2015-10-27
|\|
| * If a mouse event has no key binding, pass it through to the pane itnicm2015-10-26
| * Default bindings for mouse wheel on status line to change window (likenicm2015-10-26
| * Handle unknown keys more gracefully, return a string instead of NULL.nicm2015-10-26
* | Merge branch 'obsd-master'Thomas Adam2015-10-26
|\|
| * Some extra logging of where keys are actually going.nicm2015-10-26
* | Merge branch 'obsd-master'Thomas Adam2015-10-26
|\|
| * space before punctuation;jmc2015-10-26
* | Merge branch 'obsd-master'Thomas Adam2015-10-26
|\|
| * Extend the modifiers allowed before formats: as well as the existingnicm2015-10-25
* | -sys/types.hNicholas Marriott2015-10-25
* | Add missing headers for getpid()Thomas Adam2015-10-25
* | Merge branch 'master' of github.com:tmux/tmuxThomas Adam2015-10-25
|\ \
| * | ifdef __OpenBSD__ around pledge().Nicholas Marriott2015-10-25
* | | __OpenBSD__ around pledge()Thomas Adam2015-10-25
|/ /
* | Merge branch 'obsd-master'Thomas Adam2015-10-25
|\|
| * Pass output from jobs through format_expand() so they are expanded againnicm2015-10-25
| * Let's see if anyone screams about not being able to specify $TMPDIRderaadt2015-10-25
* | Merge branch 'obsd-master'Thomas Adam2015-10-25
|\|
| * Pasting mouse escape sequences is unlikely, so skip them when workingnicm2015-10-23
| * Remove some unnecessary checks before free().nicm2015-10-23
| * If $TMUX is set, and we are unsure about the session, use it.nicm2015-10-23
| * tmux can call pledge() in main with large set and then reduce itnicm2015-10-23
| * Format for scroll position, from Jorge Morante.nicm2015-10-23
| * Use tty_term_flag not _has for XT, and make -2 force direct use ofnicm2015-10-23
* | Merge branch 'obsd-master'Thomas Adam2015-10-22
|\|
| * If the pane is still on all_window_panes but not actually connected tonicm2015-10-22
| * Unzoom before -LRUD, reported by Andy Weidenbaum.nicm2015-10-22
| * Log identify messages.nicm2015-10-22
| * This should not be changed.nicm2015-10-22
* | Merge branch 'obsd-master'Thomas Adam2015-10-22
|\|
| * Rename shutdown to exit.nicm2015-10-22
* | Merge branch 'obsd-master'Thomas Adam2015-10-21
|\|
| * client_key_table was missing.nicm2015-10-21
* | Merge branch 'obsd-master'Thomas Adam2015-10-21
|\|
| * By popular demand add a default binding for mouse wheel up to scrollnicm2015-10-21
* | Merge branch 'obsd-master'Thomas Adam2015-10-21
|\|
| * Use client pointer not file descriptor in logging.nicm2015-10-20
* | Merge branch 'obsd-master'Thomas Adam2015-10-20
|\|
| * The table could change when retrying so don't save it at start ofnicm2015-10-20
* | Merge branch 'obsd-master'Thomas Adam2015-10-18
|\|
| * Pass current directory as a string rather than a file descriptor becausenicm2015-10-18
* | Start working on tmux 2.2Thomas Adam2015-10-18
* | Update for 2.1 release.Thomas Adam2015-10-18
* | __OpenBSD__ around pledge().Nicholas Marriott2015-10-17
* | Merge branch 'obsd-master'Thomas Adam2015-10-17
|\|