Merge master into developer

This commit is contained in:
Aurora
2016-09-08 13:39:38 +02:00
4 changed files with 6 additions and 7 deletions

View File

@@ -13,7 +13,6 @@
#define BOOTCFG_SAFEMODE BOOTCONFIG(6, 1)
#define CONFIG_NEWCPU MULTICONFIG(3)
#define CONFIG_DEVOPTIONS MULTICONFIG(4)
#define CONFIG_USESYSFIRM CONFIG(1)
#define CONFIG_USELANGEMUANDCODE CONFIG(2)
#define CONFIG_SHOWNAND CONFIG(3)