Merge branch 'master' of github.com:micropython/micropython

py/runtime.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"

py/sequence.c

@@ -2,9 +2,9 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/showbc.c

 #include <stdio.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "bc0.h"
 

py/stream.c

 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "stream.h"

py/vm.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "emitglue.h"

qemu-arm/main.c

@@ -2,9 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"

stmhal/accel.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/adc.c

@@ -2,9 +2,9 @@
 #include <stm32f4xx_hal.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "misc.h"
 #include "nlr.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/cc3k/pybcc3k.c

@@ -2,9 +2,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/dac.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "parse.h"
 #include "obj.h"

stmhal/extint.c

@@ -4,9 +4,9 @@
 
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "gc.h"
 #include "obj.h"

stmhal/help.c

 #include <stdio.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 

stmhal/i2c.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/input.c

+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "readline.h"

stmhal/lcd.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 
 #if MICROPY_HW_HAS_LCD
 

stmhal/led.c

 #include <stdio.h>
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/modos.c

 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "systick.h"

stmhal/modstm.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "modstm.h"

stmhal/modtime.c

 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "modtime.h"

stmhal/pin.c

@@ -4,9 +4,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"