Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux

Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c

1 files changed, 1 insertions, 0 deletions

diff --git a/tmux.h b/tmux.h
index 249dd5d8..4bfde70e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2217,6 +2217,7 @@ void	clear_signals(int);
 /* control.c */
 void	control_callback(struct client *, int, void*);
 void printflike2 control_write(struct client *, const char *, ...);
+void	control_write_buffer(struct client *, struct evbuffer *);
 
 /* control-notify.c */
 void	control_notify_window_layout_changed(struct window *);