aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-01-31 12:52:50 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-01-31 12:52:50 +0000
commit9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a (patch)
tree11c1c9ad419ed1dc8bb7d3b67fe01c4befff1c1c /tmux.h
parentc54a5d9fb3d282354e831b75fe0ad75035cb08b9 (diff)
parentd8da761d54ed0d2b449e412511496e67ce8d33ac (diff)
downloadrtmux-9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a.tar.gz
rtmux-9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a.tar.bz2
rtmux-9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a.zip
Merge branch 'master' of github.com:tmux/tmux
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 cb74add9..de1b823a 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1564,7 +1564,7 @@ int options_array_set(struct options_entry *, u_int, const char *,
int options_array_size(struct options_entry *, u_int *);
void options_array_assign(struct options_entry *, const char *);
int options_isstring(struct options_entry *);
-const char *options_tostring(struct options_entry *, int);
+const char *options_tostring(struct options_entry *, int, int);
char *options_parse(const char *, int *);
struct options_entry *options_parse_get(struct options *, const char *, int *,
int);