The branch, master has been updated
via e68b9abd0403d09c6af993427482e27c0f308765 (commit)
via 8a7d463b87d709914762e32d388ac7af75bbe65b (commit)
from 4621a521837d2772b6bd69b038e35391eb6f1c18 (commit)
- Log -----------------------------------------------------------------
commit e68b9abd0403d09c6af993427482e27c0f308765
Merge: 8a7d463 4621a52
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Makefile.am | 2 +-
NOTES => README | 26 ++++----------
SYNCING | 2 +-
examples/tmux.vim | 14 +++++++
www/index.html.in | 98 +++++++++++++++++++---------------------------------
5 files changed, 59 insertions(+), 83 deletions(-)
commit 8a7d463b87d709914762e32d388ac7af75bbe65b
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Prevent lock on control clients, not on others.
---
server-fn.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server-fn.c b/server-fn.c
index c09f1b7..26f93d9 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -239,7 +239,7 @@ server_lock_client(struct client *c)
size_t cmdlen;
struct msg_lock_data lockdata;
- if (!(c->flags & CLIENT_CONTROL))
+ if (c->flags & CLIENT_CONTROL)
return;
if (c->flags & CLIENT_SUSPENDED)
-----------------------------------------------------------------------
Summary of changes:
server-fn.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
