summaryrefslogtreecommitdiffstatshomepage
path: root/py/vm.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-05-02 16:58:32 +0100
committerDamien George <damien.p.george@gmail.com>2014-05-02 16:58:32 +0100
commit003977a70bc913b25885231021e4176caba6f05d (patch)
treedc2cdbb181f936d0db13939fb2ead5dbc3b3851b /py/vm.c
parent3eb8163b16bc5b6ea30428b54dee60e5c7e9c98f (diff)
parent26a99207354787cd010b833c6ea8ad348c793820 (diff)
downloadmicropython-003977a70bc913b25885231021e4176caba6f05d.tar.gz
micropython-003977a70bc913b25885231021e4176caba6f05d.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/vm.c')
-rw-r--r--py/vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/vm.c b/py/vm.c
index d3eb970427..f2ca91be52 100644
--- a/py/vm.c
+++ b/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"