diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
| commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
| tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /src/menu.c | |
| parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
| parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu.c b/src/menu.c index 45cfbbc2f..d532fc602 100644 --- a/src/menu.c +++ b/src/menu.c @@ -571,7 +571,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m MenuPrint(menuItems[i].text, left, top + 2 * i); } -void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], u8 *order) +void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order) { u8 i; |