diff options
author | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
commit | 38fcc46abb36df72512f4b532d1379dab1c13af6 (patch) | |
tree | df44258d7b5a65d2a75a146c7c01b6c683b023f9 /src/palette.c | |
parent | 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a (diff) | |
parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) |
Merge remote-tracking branch 'upstream/master' into pan-constants
Diffstat (limited to 'src/palette.c')
-rw-r--r-- | src/palette.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/palette.c b/src/palette.c index fd4ad32ad..1e92f4bba 100644 --- a/src/palette.c +++ b/src/palette.c @@ -1,6 +1,6 @@ #include "global.h" -#include "blend_palette.h" #include "palette.h" +#include "util.h" #include "decompress.h" #include "gpu_regs.h" #include "task.h" |