Merge branch 'master' into pgp

2015-04-29 23:16:43 +01:00
parent 0fece78dfe 2e75e54460
commit d5188a160e
4 changed files with 10 additions and 2 deletions
--- a/tests/ui/stub_ui.c
+++ b/tests/ui/stub_ui.c
@@ -171,6 +171,8 @@ void ui_current_print_formatted_line(const char show_char, int attrs, const char
 }

 void ui_current_error_line(const char * const msg) {}
+void ui_win_error_line(ProfWin *window, const char * const msg) {}
+

 win_type_t ui_win_type(int index)
 {