Merge remote-tracking branch 'origin/next' into

kilrah/bl_eeprom_save_load

Conflicts:
	radio/src/bootloader/boot.cpp
This commit is contained in:
bsongis
2014-04-09 10:05:42 +02:00
46 changed files with 1731 additions and 1284 deletions
+1
View File
@@ -56,6 +56,7 @@
#define BITMAPS_EXT ".bmp"
#define SCRIPTS_EXT ".lua"
#define TEXT_EXT ".txt"
#define FIRMWARE_EXT ".bin"
extern FATFS g_FATFS_Obj;