Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus

Conflicts: py/objcomplex.c
2014-01-07 15:58:30 +00:00
parent d49420e74c a5a01df81d
commit 97209d38e1
30 changed files with 117 additions and 244 deletions
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -18,7 +18,6 @@ const mp_obj_type_t none_type = {
    { &mp_const_type },
    "NoneType",
    .print = none_print,
-    .methods = {{NULL, NULL},},
 };

 static const mp_obj_none_t none_obj = {{&none_type}};