15 May 2013 17:50
[SCM] tmux branch master updated. 1.8-44-g907ad00
Nicholas Marriott <nicm <at> users.sourceforge.net>
2013-05-15 15:50:27 GMT
2013-05-15 15:50:27 GMT
The branch, master has been updated
via 907ad00300506c25ee84223811e25a411dc21517 (commit)
via 5b1cf02f2ea224922661495af32d46b024e28eef (commit)
from fce095665c62eb38826f42ae55a0fbe998f18be0 (commit)
- Log -----------------------------------------------------------------
commit 907ad00300506c25ee84223811e25a411dc21517
Merge: 5b1cf02 fce0956
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
Makefile.am
Makefile.am | 11 +++++++----
client.c | 4 ++--
cmd-choose-tree.c | 10 +++++-----
configure.ac | 3 +++
format.c | 6 +++---
job.c | 4 ++--
server-client.c | 8 +++++---
server-fn.c | 1 +
server.c | 8 ++++----
tmux.1 | 6 +++---
tmux.c | 2 +-
tmux.h | 6 ++----
window-choose.c | 14 +++++++++++---
13 files changed, 49 insertions(+), 34 deletions(-)
(Continue reading)
RSS Feed