diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /include/menu.h | |
parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) |
merge with master and fix conflicts
Diffstat (limited to 'include/menu.h')
-rw-r--r-- | include/menu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/menu.h b/include/menu.h index c8aafcb30..9a23401e0 100644 --- a/include/menu.h +++ b/include/menu.h @@ -15,4 +15,6 @@ struct MenuAction2 void (*func)(u8); }; +void box_print(u8, u8, u8, u8, const void *, s8, const u8 *); + #endif // GUARD_MENU_H |