about summary refs log tree commit diff stats
path: root/src/ui/inputwin.h
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-01-16 00:41:02 +0000
committerJames Booth <boothj5@gmail.com>2015-01-16 00:41:02 +0000
commit9fad03af747a2345fa3da7d071a6acd1017d204b (patch)
treeb18c16e89476115f288b8e95b53f9349752b29dc /src/ui/inputwin.h
parent9083bfdb5c7fa166802f1839442a045ecb61f7e9 (diff)
parent7a5deca77c4f1b792dde0a1a361b02fa86807a68 (diff)
downloadprofani-tty-9fad03af747a2345fa3da7d071a6acd1017d204b.tar.gz
Merge branch 'master' into inp-utf8
Conflicts:
	src/ui/inputwin.c
Diffstat (limited to 'src/ui/inputwin.h')
-rw-r--r--src/ui/inputwin.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/inputwin.h b/src/ui/inputwin.h
index 5d104cdb..f121c9d9 100644
--- a/src/ui/inputwin.h
+++ b/src/ui/inputwin.h
@@ -36,7 +36,7 @@
 #define UI_INPUTWIN_H
 
 void create_input_window(void);
-char* inp_get_char(int *key_type, wint_t *ch);
+char* inp_read(int *key_type, wint_t *ch);
 void inp_win_reset(void);
 void inp_win_resize(void);
 void inp_put_back(void);