diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-05-13 08:32:46 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-05-13 08:32:46 +0100 |
| commit | 2377092a70db3327cbeb07328ea8422d0395edc4 (patch) | |
| tree | c5ede8c90856cf9ded1a0d62e62fe1089d580ef3 /tmux.h | |
| parent | af25cab11b4dc17d3c1a7c2c2cf6e40b8f2b3ae9 (diff) | |
| parent | 6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c (diff) | |
| download | rtmux-2377092a70db3327cbeb07328ea8422d0395edc4.tar.gz rtmux-2377092a70db3327cbeb07328ea8422d0395edc4.tar.bz2 rtmux-2377092a70db3327cbeb07328ea8422d0395edc4.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 *); |