aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-05-12 18:01:10 +0100
committerThomas Adam <thomas@xteddy.org>2016-05-12 18:01:10 +0100
commit6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c (patch)
treedf22b83d46308de5bf6815fff8f01778e5c83ab0 /tmux.h
parent3ec7e3c006d3eb86547b5a1b47dd8d873d7b0284 (diff)
parentfdd368a2945f1f5cbd1cd2a858c00ebffdbf7e46 (diff)
downloadrtmux-6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c.tar.gz
rtmux-6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c.tar.bz2
rtmux-6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmux.h b/tmux.h
index b19f6819..1f0301dd 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1557,7 +1557,7 @@ extern int cfg_finished;
extern int cfg_references;
extern struct client *cfg_client;
void start_cfg(void);
-int load_cfg(const char *, struct cmd_q *, char **);
+int load_cfg(const char *, struct cmd_q *, int);
void set_cfg_file(const char *);
void printflike(1, 2) cfg_add_cause(const char *, ...);
void cfg_print_causes(struct cmd_q *);