aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmuxNicholas Marriott2012-11-22
|\
| * Merge branch 'obsd-master'Thomas Adam2012-11-22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Sync from OpenBSD. * obsd-master: Add halfpage commands to mode command string table (missed by accident), from Thomas Adam. Clarify some points about config files, notably that they are only read at server start. From Thomas Adam. Use a utility function for common code to show errors in config file, from Thomas Adam.
| | * Add halfpage commands to mode command string table (missed by accident),Nicholas Marriott2012-11-19
| | | | | | | | | | | | from Thomas Adam.
| | * Clarify some points about config files, notably that they are only readNicholas Marriott2012-11-19
| | | | | | | | | | | | at server start. From Thomas Adam.
| | * Use a utility function for common code to show errors in config file,Nicholas Marriott2012-11-19
| | | | | | | | | | | | from Thomas Adam.
| * | Sanitise additional .mailmap entriesThomas Adam2012-11-08
| | | | | | | | | | | | | | | This sanitises multiple author addresses some more, mapping them back to one common entity.
| * | Merge branch 'obsd-master'Thomas Adam2012-11-08
| |\| | | | | | | | | | Sync from OpenBSD.
| | * Show last client activity time in default choose-client list.Nicholas Marriott2012-11-05
| | |
| * | Add .mailmap for commit author translationsThomas Adam2012-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it's not possible to enumerate up-front all of the committers to tmux coming from OpenBSD, at the time a commit is imported in to git from the OpenBSD CVS repository, the author information is not known to Git, necessarily. But it's possible to alter for output the respective author after the fact, via Git's .mailmap file. It is this file which will therefore provide a new mapping of OpenBSD commiter to an actual real name and real email address.
| * | Merge branch 'obsd-master'Thomas Adam2012-11-04
| |\| | | | | | | | | | Sync from OpenBSD.
| | * fix an off-by-oneokan2012-10-31
| | | | | | | | | | | | ok nicm@
| * | Merge branch 'obsd-master'Thomas Adam2012-10-26
| |\| | | | | | | | | | Sync from OpenBSD.
| | * Make mouse event structure clearer by defining events (up, click, drag)Nicholas Marriott2012-10-26
| | | | | | | | | | | | | | | and simplifying how buttons and wheels are represented, from Ailin Nemui. Should be no functional changes.
| * | Merge branch 'obsd-master'Thomas Adam2012-10-25
| |\| | | | | | | | | | Sync from OpenBSD.
| | * Add ability to active pane in list-windows and find-window formats, fromNicholas Marriott2012-10-25
| | | | | | | | | | | | Carl Henrik Lunde.
| | * Fix BELL_NONE which had been broken in some code reorganisation or otherNicholas Marriott2012-10-25
| | | | | | | | | | | | also don't redraw unnecessarily. From Seiji Ohashi.
| | * Fix bad size in memcpy from Romain Francoise.Nicholas Marriott2012-10-25
| | |
| | * Fix typo bell->bells from Thomas Adam.Nicholas Marriott2012-10-25
| | |
| * | Merge branch 'obsd-master'Thomas Adam2012-10-16
| |\| | | | | | | | | | Sync from OpenBSD.
| | * Fix some function prototypes from Helmut Tessarek.Nicholas Marriott2012-10-15
| | |
* | | +.Nicholas Marriott2012-10-23
|/ /
* | Link to git instructions from index.html.Nicholas Marriott2012-10-15
| |
* | Don't push all tags when releasing tmuxThomas Adam2012-10-13
| | | | | | | | | | | | | | | | Pushing all tags with "git push --tags" will also transfer tags from the tmux-openbsd repository which isn't what we want to do! Therefore, just specify the newly created tag to push instead for the next release.
* | 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
|\| | | | | | | Sync from OpenBSD.
| * Fix a use-after-free when collapsing the tree in choose mode, fromNicholas Marriott2012-10-11
| | | | | | | | Carl Henrik Lunde.
* | Merge branch 'obsd-master'Thomas Adam2012-10-09
|\| | | | | | | Sync from OpenBSD.
| * 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
| | | | | | | | file.
* | Reference PATCHES document from TODO fileThomas Adam2012-10-05
| | | | | | | | | | In terms of submitting patches via the TODO file from the tmux portable repository, mention the PATCHES file in passing.
* | Add PATCHES documentThomas Adam2012-10-05
| | | | | | | | | | This describes how to send patches against the portable tmux version as hosted on souceforge, using Git.
* | Add explanatory sections to TODO fileThomas Adam2012-10-04
| | | | | | | | | | This restructures the TODO file slightly, separating out the terminal-specific tasks from the tmux user interface tasks.
* | +.Thomas Adam2012-10-04
| |
* | Add choose-list to tmux.vimThomas Adam2012-10-02
| |
* | Update TODO list.Thomas Adam2012-10-02
| | | | | | | | Keeping this in sync with work done.
* | Merge branch 'obsd-master'Thomas Adam2012-10-02
|\| | | | | | | | | | | | | | | Sync from OpenBSD. * obsd-master: Allow session tree (C-b s) to expand and collapse sessions with left/right/space keys. From Thomas Adam. Remove some out of date text from man page, from Thomas Adam.
| * Allow session tree (C-b s) to expand and collapse sessions withNicholas Marriott2012-10-02
| | | | | | | | left/right/space keys. From Thomas Adam.
| * 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
|\| | | | | | | | | | | | | Sync from OpenBSD. * obsd-master: Do not leak file descriptor if not a tty, reported by Sebastien Marie.
| * 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
|\| | | | | | | Sync from OpenBSD.
| * 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
| | | | | | | | 3571114 from "LiJunLe".
* | Fix up missing bits.Nicholas Marriott2012-09-25
| |