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

Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c
This commit is contained in:
Nicholas Marriott
2012-09-25 08:07:39 +01:00
3 changed files with 12 additions and 4 deletions

1
tmux.h
View File

@@ -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 *);