aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-12-11
|\
| * Merge branch 'obsd-master'Thomas Adam2015-12-11
| |\
| | * Style nits and line wrapping of function declarations.nicm2015-12-11
| | * Mention {src,dst}-{window,pane} where we define target-{window,pane}.nicm2015-12-11
* | | Look for ncurses with PKG_CONFIG, and remove libtinfo because it just causesNicholas Marriott2015-12-11
|/ /
* | Merge branch 'obsd-master'Thomas Adam2015-12-11
|\|
| * We cannot do hooks_find and then hooks_remove because it might have comenicm2015-12-11
* | Merge branch 'obsd-master'Thomas Adam2015-12-11
|\|
| * Check alerts when session changes, from Patrick Palka.nicm2015-12-11
| * Add cmdq as an argument to format_create and add a format for thenicm2015-12-11
* | Merge branch 'obsd-master'Thomas Adam2015-12-08
|\|
| * Remove format_create_flags and just pass flags to format_create.nicm2015-12-08
| * Spacing nits.nicm2015-12-08
* | Add to .mailmap, and sort.Nicholas Marriott2015-12-08
* | Merge branch 'obsd-master'Thomas Adam2015-12-08
|\|
| * Ed was meant to be El;jmc2015-12-08
* | Conflicts:Thomas Adam2015-12-08
|\|
| * Add hooks infrastructure, basic commands (set-hook, show-hooks) and anicm2015-12-08
| * Use ^= instead of a verbose alternative. ok nicm@mmcc2015-12-08
* | termios(4)Nicholas Marriott2015-12-08
* | pty(7) -> pty(4)Nicholas Marriott2015-12-08
* | pty is in section 4Nicholas Marriott2015-12-08
* | Update tmux.vim from Teubel Gyorgy.Nicholas Marriott2015-12-07
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-12-07
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-12-07
| |\|
| | * Fix bell indicators across detach, reported by Torbjorn Lonnemark, diffnicm2015-12-07
| * | Merge branch 'obsd-master'Thomas Adam2015-12-05
| |\|
| | * EAGAIN handling for imsg_read. OK henning@ benno@claudio2015-12-05
* | | Update .mailmap file.Nicholas Marriott2015-12-07
|/ /
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-12-03
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-12-03
| |\|
| | * Mark new active pane changed after pane lost in window, and afternicm2015-12-02
| * | Merge branch 'obsd-master'Thomas Adam2015-12-01
| |\|
| | * Do not deref wp if window_get_active_at returns NULL which can happen onnicm2015-12-01
| * | Merge branch 'obsd-master'Thomas Adam2015-11-29
| |\|
| | * Delete a duplicated lineguenther2015-11-29
| * | Merge branch 'obsd-master'Thomas Adam2015-11-27
| |\|
| | * Do not set a limit on the length of commands when printing them.nicm2015-11-27
* | | Add to TODO.Nicholas Marriott2015-12-03
|/ /
* | Add to TODO.Nicholas Marriott2015-11-25
* | log_open() isn't conditional on proctitleThomas Adam2015-11-25
* | Remove logfile()Thomas Adam2015-11-25
* | Merge branch 'obsd-master'Thomas Adam2015-11-25
|\|
| * Don't print error if none to print.nicm2015-11-25
| * Make environ_set va_args and use it to tidy up some calls. Also add anicm2015-11-24
| * Shell command from -c doesn't have to be global, pass it as an argument.nicm2015-11-24
| * Do lock failures slightly better, return a special value so we don'tnicm2015-11-24
| * Actually show something (even if it not that helpful) if the servernicm2015-11-24
| * Document socket_path format.nicm2015-11-24
| * Tidy the code that works out the socket path, and just use the full pathnicm2015-11-24