aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'obsd-master'Thomas Adam2015-02-24
|\
| * When given an invalid style, don't set the option to the default. Fixnicm2015-02-18
* | Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeNicholas Marriott2015-02-18
|\ \
| * | Revert "Add -Wno-format-nonliteral to Makefile.am"Thomas Adam2015-02-15
| * | Add -Wno-format-nonliteral to Makefile.amThomas Adam2015-02-15
| * | Merge branch 'obsd-master'Thomas Adam2015-02-14
| |\|
| | * Take a reference to prevent cmdq being freed during the command. Cannicm2015-02-12
| | * Merge clock-mode command into copy-mode.nicm2015-02-09
| | * Entries in the window list can be NULL, prompted by a crash seen by Bennicm2015-02-09
| | * Check for \0 in the right place, from J Raynor.nicm2015-02-07
| | * Use the same time for both calls to format_expand_time.nicm2015-02-06
* | | Merge branch 'tmp'Nicholas Marriott2015-02-18
|\ \ \ | |/ / |/| |
| * | Remove LocalWords.Nicholas Marriott2015-02-16
* | | Add a note about cmd_find_*.Nicholas Marriott2015-02-09
* | | No paths.h on Solaris.Nicholas Marriott2015-02-06
* | | Merge branch 'obsd-master'Thomas Adam2015-02-06
|\ \ \ | | |/ | |/|
| * | status_replace can now become local to status.c and it no longer needsnicm2015-02-06
| * | Use formats not status_replace for set-titles-string.nicm2015-02-06
| * | Add format_expand_time and use it instead of status_replace wherenicm2015-02-06
| * | Move pane border options to window options rather than session, from Marc Finet.nicm2015-02-06
| * | Reset bracket paste mode on detach.nicm2015-02-05
| * | Remove a couple of now-unused variables.nicm2015-02-05
| * | Wrap all the individual format_* calls in a single format_defaultsnicm2015-02-05
| * | There is no need to save the guard state because the function checks itnicm2015-02-05
| * | Remove two unused arguments from status_replace.nicm2015-02-01
| * | Tidy up detach-client a bit.nicm2015-01-30
| * | Focus off needs to be sent with tty_raw, reported by Geoff Nixon.nicm2015-01-30
| * | Don't leak the individual strings when copying environment.nicm2015-01-25
| * | In options-table.c r1.51 an extra space was added to the default status-right,sthen2015-01-21
| * | typo in comment ;) ok nicmsthen2015-01-20
| * | Support blinking cursor mode, both the xterm CSI ?12 h/l and (thenicm2015-01-20
| * | Make a tmux-%u directory under TMUX_TMPDIR, like TMPDIR.nicm2015-01-19
* | | has-session is now part of new-session.Nicholas Marriott2015-01-29
* | | Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeNicholas Marriott2015-01-25
|\ \ \
| * | | Merge branch 'obsd-master'Thomas Adam2015-01-16
| |\| |
| | * | Replace <sys/param.h> with <limits.h> and other less dirty headers wherederaadt2015-01-16
| | * | Remove an unnecessary variable and shorten a line.nicm2015-01-15
| | * | Shorten some long lines.nicm2015-01-15
| | * | correctly use HOST_NAME_MAX.deraadt2015-01-11
* | | | Spaces to tabs.Nicholas Marriott2015-01-25
|/ / /
* | | Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeNicholas Marriott2015-01-12
|\ \ \
| * | | Merge branch 'obsd-master'Thomas Adam2015-01-10
| |\| |
| | * | Revert to r1.16 since this is still clearly broken and I can't see hownicm2015-01-06
| | * | Unzoom before kill, from Thomas Adam.nicm2015-01-06
| | * | Add missing default bindings, from Theo Buehler.nicm2015-01-06
* | | | We do not need to add /usr/local to CPPFLAGS; if configure managed to pass thenNicholas Marriott2015-01-12
|/ / /
* | | Need param.h, from Ismail Donmez.Nicholas Marriott2014-12-31
* | | Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeNicholas Marriott2014-12-21
|\ \ \
| * \ \ Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-codeThomas Adam2014-12-19
| |\ \ \
| * \ \ \ Merge branch 'obsd-master'Thomas Adam2014-12-19
| |\ \ \ \ | | | |/ / | | |/| |