diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
| commit | 4683cdc30cbe81db56b69dfeb7a1fb32fe6641e2 (patch) | |
| tree | c7c791620bcb6849a24b549b4a5c48abec281c10 /src/diploma.c | |
| parent | 606fb71392651dac4f5f8773c4117f35de7b087e (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge branch 'master' into weather
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diploma.c b/src/diploma.c index f8556eb7d..b3d5a48fa 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -5,7 +5,7 @@ #include "gpu_regs.h" #include "scanline_effect.h" #include "task.h" -#include "malloc.h" +#include "alloc.h" #include "decompress.h" #include "bg.h" #include "window.h" |