Merge branch 'master' into weather

2018-12-09 11:56:50 +01:00
parent 606fb71392 0b91d2948a
commit 4683cdc30c
125 changed files with 29614 additions and 25811 deletions
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -14,7 +14,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"