aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'obsd-master'Thomas Adam2012-10-16
|\
| * Fix some function prototypes from Helmut Tessarek.Nicholas Marriott2012-10-15
* | Link to git instructions from index.html.Nicholas Marriott2012-10-15
* | Don't push all tags when releasing tmuxThomas Adam2012-10-13
* | Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmuxThomas Adam2012-10-13
|\ \
| * | Working on 1.8Thomas Adam2012-10-13
| * | Update NOTES, CHANGES, configure.ac for 1.7 releaseThomas Adam2012-10-13
* | | Update website.Thomas Adam2012-10-13
|/ /
* | Merge branch 'obsd-master'Thomas Adam2012-10-11
|\|
| * Fix a use-after-free when collapsing the tree in choose mode, fromNicholas Marriott2012-10-11
* | Merge branch 'obsd-master'Thomas Adam2012-10-09
|\|
| * Add tree keys to vi mode too, missed by accident.Nicholas Marriott2012-10-09
* | Remove references to PATCHES fileThomas Adam2012-10-07
* | Make some tweaks to NOTES and add a paragraph on git rather than huge PATCHESNicholas Marriott2012-10-05
* | Reference PATCHES document from TODO fileThomas Adam2012-10-05
* | Add PATCHES documentThomas Adam2012-10-05
* | Add explanatory sections to TODO fileThomas Adam2012-10-04
* | +.Thomas Adam2012-10-04
* | Add choose-list to tmux.vimThomas Adam2012-10-02
* | Update TODO list.Thomas Adam2012-10-02
* | Merge branch 'obsd-master'Thomas Adam2012-10-02
|\|
| * Allow session tree (C-b s) to expand and collapse sessions withNicholas Marriott2012-10-02
| * Remove some out of date text from man page, from Thomas Adam.Nicholas Marriott2012-10-02
* | Merge branch 'obsd-master'Thomas Adam2012-10-01
|\|
| * Do not test client flags against TTY_FREEZE bit, reported by Tom Ryder.Nicholas Marriott2012-09-29
* | Merge branch 'obsd-master'Thomas2012-09-27
|\|
| * Do not leak file descriptor if not a tty, reported by Sebastien Marie.Nicholas Marriott2012-09-27
* | Merge branch 'obsd-master'Thomas Adam2012-09-25
|\|
| * Add notification for input from a pane, from George Nachman.Nicholas Marriott2012-09-25
| * Fix search forward so it can match strings on the last line, SF bugNicholas Marriott2012-09-25
* | Fix up missing bits.Nicholas Marriott2012-09-25
* | Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmuxNicholas Marriott2012-09-25
|\ \
| * | Don't rely on "-s ours" for mergingThomas Adam2012-09-24
| * | Merge branch 'obsd-master'Thomas Adam2012-09-24
| |\|
| | * Add control_write_buffer, from George Nachman.Nicholas Marriott2012-09-24
| * | Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.Nicholas Marriott2012-09-24
| * | Use ACS characters for choose-tree arrows based on diff from RomainNicholas Marriott2012-09-24
* | | Merge branch 'obsd-master'Thomas2012-09-24
|\ \ \ | | |/ | |/|
| * | Use pgrp of pty fd not pid of immediate child when recovering currentNicholas Marriott2012-09-24
| * | Use ACS characters for choose-tree arrows based on diff from RomainNicholas Marriott2012-09-24
* | | Use pgrp of pty fd not pid of immediate child when recovering current workingNicholas Marriott2012-09-24
* | | Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.Nicholas Marriott2012-09-24
| |/ |/|
* | Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmuxThomas Adam2012-09-20
|\ \
| * | .+ SYNCING.Thomas Adam2012-09-19
* | | Add release instructions for new tmux versionsThomas Adam2012-09-20
|/ /
* | Add SYNCING documentThomas Adam2012-09-16
* | Merge branch 'obsd-master'Thomas Adam2012-09-15
|\|
| * Handle empty list properly in choose-list, based on fix from Thomas Adam.Nicholas Marriott2012-09-05
| * We can't tell what the terminal has done with a DCS string, so reset theNicholas Marriott2012-09-05
| * Trivial code simplification from Tim Ruehsen.Nicholas Marriott2012-09-04