diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-05 01:57:54 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-05 01:57:54 +0000 |
commit | 7e73a8fd09a8070a3bbb90d2ddc4f04af4e2828a (patch) | |
tree | 606e074a1955f381c68d1689946066e9eb1a5a47 /py/objmodule.c | |
parent | 5d4a8213395b1e27d303379772c90b3b0adc82d5 (diff) | |
parent | 45b43c21c4f8e30dcff00c2429eddba20ca002aa (diff) | |
download | micropython-7e73a8fd09a8070a3bbb90d2ddc4f04af4e2828a.tar.gz micropython-7e73a8fd09a8070a3bbb90d2ddc4f04af4e2828a.zip |
Merge remote-tracking branch 'upstream/master' into list_index
Diffstat (limited to 'py/objmodule.c')
-rw-r--r-- | py/objmodule.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/py/objmodule.c b/py/objmodule.c index addab14b75..9263eb44f0 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -25,6 +25,7 @@ const mp_obj_type_t module_type = { { &mp_const_type }, "module", module_print, // print + NULL, // make_new NULL, // call_n NULL, // unary_op NULL, // binary_op |