diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 03:21:04 +0300 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 03:21:04 +0300 |
commit | 8d1996833bd73271ca14a3df46633d9b2ed13052 (patch) | |
tree | daedb1622096e5bb6b8b9ec15882769b827506e1 /src/extras | |
parent | c17ccc50ab76e7f161af484400914db373dcafae (diff) | |
parent | a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334 (diff) |
merge attempt
Diffstat (limited to 'src/extras')
-rw-r--r-- | src/extras/debugmenu.cpp | 2 | ||||
-rw-r--r-- | src/extras/re3_inttypes.h (renamed from src/extras/inttypes.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/extras/debugmenu.cpp b/src/extras/debugmenu.cpp index 3a4c4175..533b97f5 100644 --- a/src/extras/debugmenu.cpp +++ b/src/extras/debugmenu.cpp @@ -5,7 +5,7 @@ #include "ControllerConfig.h" #include "Timer.h" #include "rtcharse.h" -#include "inttypes.h" +#include "re3_inttypes.h" #include "debugmenu.h" #include <new> diff --git a/src/extras/inttypes.h b/src/extras/re3_inttypes.h index bf0c53e2..bf0c53e2 100644 --- a/src/extras/inttypes.h +++ b/src/extras/re3_inttypes.h |