aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | | | | | | server_client_handle_key.
* | Merge branch 'obsd-master'Thomas Adam2015-10-18
|\|
| * Pass current directory as a string rather than a file descriptor becausenicm2015-10-18
| | | | | | | | pledge doesn't let us pass directory file descriptors.
* | 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
|\|
| * Add pledge "stdio unix sendfd proc exec tty" to tmux client process,nicm2015-10-17
| | | | | | | | "sendfd" is dropped after first message from the server.
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-10-17
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-10-16
| |\|
| | * Don't free after calling paste_set but do after evbuffer_add, from Theonicm2015-10-16
| | | | | | | | | | | | Buehler.
* | | time.h is not needed now tzset() is not in log.c.Nicholas Marriott2015-10-17
|/ /
* | Some header fixes.Nicholas Marriott2015-10-15
| |
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-10-15
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-10-11
| |\|
| | * Userspace doesn't need to use SUN_LEN(): connect() and bind() must acceptguenther2015-10-11
| | | | | | | | | | | | | | | | | | sizeof(struct sockaddr_un), so do the simple, portable thing ok beck@ deraadt@
| * | Merge branch 'obsd-master'Thomas Adam2015-10-07
| |\|
| | * Couple of memory leaks in error paths, from Frederik Vanderstraeten.nicm2015-10-07
| | |
* | | Fix available_fds when there is no AF_INET, reported by Mathieu Arnold.Nicholas Marriott2015-10-15
|/ /
* | Merge branch 'obsd-master'Thomas Adam2015-09-26
|\|
| * Adding colors=256 to *256color* was always pretty stupid and now itnicm2015-09-25
| | | | | | | | won't work (without adding setaf@:setab@ too).
| * If the terminal has colors=256, only try to use setaf/setab if theynicm2015-09-25
| | | | | | | | exist, reported by Filipe Brandenburger.
* | Merge branch 'obsd-master'Thomas Adam2015-09-25
|\|
| * Free the history when it is cleared, based on a diff from Carlo Cannas.nicm2015-09-25
| |
* | Merge branch 'obsd-master'Thomas Adam2015-09-24
|\|
| * Don't leak fd and path on failure.nicm2015-09-24
| |
| * Do not leak log file descriptor.nicm2015-09-24
| |
* | Merge branch 'obsd-master'Thomas Adam2015-09-24
|\|
| * Assign flag not number for flag types (we got away with it so farnicm2015-09-24
| | | | | | | | because that are a union). From Filipe Brandenburger.
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-09-23
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-09-23
| |\|
| | * Don't update last session when the session is unchanged, from Sina Siadat.nicm2015-09-22
| | |
| * | Merge branch 'obsd-master'Thomas Adam2015-09-21
| |\|
| | * Reset the alerts timer always on activity, from Thomas Adam.nicm2015-09-21
| | |
| * | Merge branch 'obsd-master'Thomas Adam2015-09-18
| |\|
| | * -l should apply to the new not the old pane with -b, from "MadMaverick9"nicm2015-09-18
| | | | | | | | | | | | on GitHub.
| * | Merge branch 'obsd-master'Thomas Adam2015-09-17
| |\|
| | * Redraw both src and dst sessions in break-pane.nicm2015-09-17
| | |
* | | Add to TODO.Nicholas Marriott2015-09-23
|/ /
* | Merge branch 'obsd-master'Thomas Adam2015-09-17
|\|
| * Log when cmdq_continue is called.nicm2015-09-16
| |
| * Give some variables less silly names.nicm2015-09-16
| |
| * A few minor style nits.nicm2015-09-16
| |
| * Hoist some common code out of both branches of an if/else.nicm2015-09-16
| |
| * Rename cmd_q dead flag to a general flags bitmask (will be more flags later).nicm2015-09-16
| |
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-09-15
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-09-14
| |\|