aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-10-15 12:01:14 +0100
committerThomas Adam <thomas@xteddy.org>2016-10-15 12:01:14 +0100
commit59d11474694ba0f1cc38b65d19a25b4e7c22a523 (patch)
tree8b9fe526af062ba104c5c40432f904fd9c445c34 /tmux.h
parent623e54788e77068779933eb60a042e5a82f32673 (diff)
parente7990375cb130853505fb2ff3a2fa801537119e5 (diff)
downloadrtmux-59d11474694ba0f1cc38b65d19a25b4e7c22a523.tar.gz
rtmux-59d11474694ba0f1cc38b65d19a25b4e7c22a523.tar.bz2
rtmux-59d11474694ba0f1cc38b65d19a25b4e7c22a523.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmux.h b/tmux.h
index e61472f8..cf4a3eca 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2063,8 +2063,8 @@ void winlink_stack_remove(struct winlink_stack *, struct winlink *);
struct window *window_find_by_id_str(const char *);
struct window *window_find_by_id(u_int);
void window_update_activity(struct window *);
-struct window *window_create1(u_int, u_int);
-struct window *window_create(const char *, int, char **, const char *,
+struct window *window_create(u_int, u_int);
+struct window *window_create_spawn(const char *, int, char **, const char *,
const char *, const char *, struct environ *,
struct termios *, u_int, u_int, u_int, char **);
void window_destroy(struct window *);