aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'obsd-master'Thomas Adam2017-10-08
|\
| * Fix description of history_size, from Campbell Barton.nicm2017-10-08
* | Merge branch 'obsd-master'Thomas Adam2017-10-06
|\|
| * Support %else in config files to match %if, from Brad Town in GitHubnicm2017-10-06
* | Merge branch 'obsd-master'Thomas Adam2017-10-06
|\|
| * Add -- to some key bindings so leading -s work.nicm2017-10-05
| * Add support for the xterm(1) title stack, from Brad Town, GitHub issuenicm2017-10-05
| * When writing batches of characters to the screen, we need to clearnicm2017-10-05
* | Merge branch '2.6-rc'Nicholas Marriott2017-10-05
|\ \
| * | 2.6.Nicholas Marriott2017-10-05
| * | Initialize alerts timer event where it is used, avoids crash with new windows.nicm2017-09-22
| * | 2.6-rc3.Nicholas Marriott2017-09-11
* | | Merge branch 'obsd-master'Thomas Adam2017-09-22
|\ \ \ | | |/ | |/|
| * | Initialize alerts timer event where it is used, avoids crash with new windows.nicm2017-09-22
* | | Merge branch 'obsd-master'Thomas Adam2017-09-13
|\| |
| * | Remove unused (always 1) arguments from some functions, from Danielnicm2017-09-13
* | | Merge branch 'obsd-master'Thomas Adam2017-09-11
|\| |
| * | Check event is initialized before delete; fixes crash reported bynicm2017-09-11
* | | 2.6-rc3.Nicholas Marriott2017-09-11
| |/ |/|
* | Merge branch 'master' into 2.6-rcNicholas Marriott2017-09-11
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2017-09-11
| |\|
| | * Mention that filter is a format.nicm2017-09-11
| | * Do not free more lines than are available in the history.nicm2017-09-11
* | | 2.6-rc2.Nicholas Marriott2017-09-10
* | | Merge branch 'master' into 2.6-rcNicholas Marriott2017-09-10
|\| |
| * | Merge branch 'obsd-master'Thomas Adam2017-09-10
| |\|
| | * Previously, extended cell data was never reduced in size even when thenicm2017-09-10
* | | Merge branch 'master' into 2.6-rcNicholas Marriott2017-09-10
|\| |
| * | Merge branch 'obsd-master'Thomas Adam2017-09-10
| |\|
| | * Apply timeout to CAN and RS which also wait for ST.nicm2017-09-10
| | * Fix a few errors in how the selected line is chosen after resize,nicm2017-09-08
| | * When removing a key table clear it out of clients, fixes issue withnicm2017-09-08
| | * Do not fail if unset an option that is already unset, reported by Thomasnicm2017-09-07
| | * Do not attempt to use TIOCSWINSZ on a -1 file descriptor (possible ifnicm2017-09-06
| * | Add to CHANGES.Nicholas Marriott2017-09-08
| * | Merge branch 'obsd-master'Thomas Adam2017-09-04
| |\|
| | * Move to current mouse position not last when clcking in copy mode; fixesnicm2017-09-04
| * | Merge branch 'obsd-master'Thomas Adam2017-09-02
| |\|
| | * Add selectp -T to set pane title.nicm2017-09-02
| * | Mention GitHub for code.Nicholas Marriott2017-08-30
| * | Add to CHANGES.Nicholas Marriott2017-08-30
* | | Add to CHANGES.Nicholas Marriott2017-08-30
|/ /
* | Merge branch 'master' into 2.6-rcNicholas Marriott2017-08-30
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2017-08-30
| |\|
| | * Instead of overloading the line clear function to mean free ifnicm2017-08-30
* | | Merge branch 'master' into 2.6-rcNicholas Marriott2017-08-30
|\| |
| * | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2017-08-30
| |\ \
| | * | Merge branch 'obsd-master'Thomas Adam2017-08-30
| | |\|
| | | * Pass flags into cmd_find_from_* to fix prefer-unattached, reported bynicm2017-08-30
| * | | Add to TODO.Nicholas Marriott2017-08-30
| |/ /