summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/ThomasAdam/tmux into upstreamupstreamRaghavendra D Prabhu2011-07-0825-317/+434
|\
| * Merge remote branch 'git-svn'Thomas Adam2011-07-085-56/+53
| |\
| | * Sync OpenBSD patchset 934:tcunha2011-07-084-53/+50
| | * Sync OpenBSD patchset 933:tcunha2011-07-081-3/+3
| * | Merge remote branch 'git-svn'Thomas Adam2011-07-0724-295/+415
| |\ \ | | |/
| | * Sync OpenBSD patchset 932:tcunha2011-07-052-23/+53
| | * Sync OpenBSD patchset 931:tcunha2011-07-052-6/+5
| | * Done too.nicm2011-07-041-1/+0
| | * Done too.nicm2011-07-041-1/+0
| | * These are done.nicm2011-07-041-7/+1
| | * Sync OpenBSD patchset 930:tcunha2011-07-041-22/+34
| | * Sync OpenBSD patchset 929:tcunha2011-07-043-2/+34
| | * Sync OpenBSD patchset 928:tcunha2011-07-043-2/+10
| | * Sync OpenBSD patchset 927:tcunha2011-07-035-28/+77
| | * Sync OpenBSD patchset 926:tcunha2011-07-032-4/+1
| | * Sync OpenBSD patchset 925:tcunha2011-07-031-3/+7
| | * +.nicm2011-06-271-0/+1
| | * tparm requires 10 arguments on Solaris.nicm2011-06-261-2/+2
| | * +.nicm2011-06-261-0/+1
| | * trunk/tmux not tmux/tmuxnicm2011-06-241-1/+1
| | * Tweaks, one thing I have an uncommitted fix for.nicm2011-06-231-3/+1
| | * PatchSet 924nicm2011-06-235-1/+111
| | * Removed file.nicm2011-06-231-1/+0
| | * PatchSet 923nicm2011-06-235-194/+75
| | * PatchSet 922nicm2011-06-231-3/+3
| | * Add.nicm2011-06-051-0/+1
| | * Add.nicm2011-06-051-0/+5
| | * Add.nicm2011-06-051-0/+1
| | * $Id$ not $OpenBSD$.tcunha2011-05-291-1/+1
* | | Merge branch 'master' of https://github.com/ThomasAdam/tmux into upstreamRaghavendra D Prabhu2011-05-291451-0/+329225
|\ \ \ | |/ /
| * | Chmod +x autogen.shThomas Adam2011-05-261-0/+0
| |/
| * Sync OpenBSD patchset 921:tcunha2011-05-261-2/+2
| * Sync OpenBSD patchset 920:tcunha2011-05-261-1/+2
| * Sync OpenBSD patchset 819:tcunha2011-05-261-6/+2
| * One of these gives us b64_ntop.nicm2011-05-261-0/+2
| * Add.nicm2011-05-261-0/+3
| * Bye bye stray tmux directory.nicm2011-05-230-0/+0
| * ...nicm2011-05-221-1/+0
| * ...nicm2011-05-221-0/+1
| * ...nicm2011-05-221-1/+0
| * ...nicm2011-05-221-0/+1
| * ...nicm2011-05-221-1/+0
| * .nicm2011-05-221-3/+3
| * Update links.nicm2011-05-221-5/+5
| * Sync OpenBSD patchset 918:tcunha2011-05-221-23/+24
| * Sync OpenBSD patchset 917:tcunha2011-05-222-7/+23
| * Sync OpenBSD patchset 916:tcunha2011-05-227-7/+60
| * Sync OpenBSD patchset 915:tcunha2011-05-228-24/+110
| * Sync OpenBSD patchset 914:tcunha2011-05-227-8/+107
| * Someone mentioned this at LinuxTag as well.nicm2011-05-211-0/+2