diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-09-10 15:38:02 +0100 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-09-10 15:38:02 +0100 |
commit | abcbfcb0e801598a868ca6eee0127ebf4bf4ace8 (patch) | |
tree | 814e371bcd15a6e3c5ba3757173196b646fe0306 /input.c | |
parent | 6e2b3f435ae49e4d372476c4a8a2ef64d497c87d (diff) | |
parent | 7f83b53027c98589b516c4137a2fbc48a70e230b (diff) | |
download | rtmux-abcbfcb0e801598a868ca6eee0127ebf4bf4ace8.tar.gz rtmux-abcbfcb0e801598a868ca6eee0127ebf4bf4ace8.tar.bz2 rtmux-abcbfcb0e801598a868ca6eee0127ebf4bf4ace8.zip |
Merge branch 'master' into 2.6-rc
Diffstat (limited to 'input.c')
-rw-r--r-- | input.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -433,7 +433,7 @@ static const struct input_state input_state_rename_string = { /* consume_st state definition. */ static const struct input_state input_state_consume_st = { "consume_st", - NULL, NULL, + input_enter_rename, NULL, /* rename also waits for ST */ input_state_consume_st_table }; |