Merge branch 'master' into link

2018-02-03 09:42:19 -05:00
parent d4e8c20f84 eb6aed50e5
commit d52f52fa73
133 changed files with 14287 additions and 26107 deletions
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -6,7 +6,7 @@
 #include "main.h"
 #include "sprite.h"
 #include "task.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "window.h"
 #include "text.h"
 #include "menu.h"