diff options
author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/field_region_map.c | |
parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/field_region_map.c')
-rw-r--r-- | src/field_region_map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_region_map.c b/src/field_region_map.c index 40f48e668..d49ce3a4e 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -3,7 +3,7 @@ #include "gpu_regs.h" #include "international_string_util.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "palette.h" #include "region_map.h" |