Merge branch 'master' into developer

2016-04-30 03:34:52 +02:00 · 2016-04-30 03:34:52 +02:00 · 408c70b90c
commit 408c70b90c
parent 1e6d7a5aee 5b51574ebf
1 changed files with 1 additions and 1 deletions
--- a/source/fs.c
+++ b/source/fs.c
@ -5,9 +5,9 @@
 #include "fs.h"
 #include "memory.h"
 #include "screeninit.h"
-#include "../build/loader.h"
 #include "fatfs/ff.h"
 #include "buttons.h"
+#include "../build/loader.h"

 #define PAYLOAD_ADDRESS	0x24F00000
 #define PATTERN(a) a "_*.bin"