diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /src/menu.c | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (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; |