aboutsummaryrefslogtreecommitdiff
path: root/SYNCING
Commit message (Expand)AuthorAge
* Don't rely on "-s ours" for mergingThomas Adam2012-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