diff options
author | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:39:03 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:39:03 +0000 |
commit | 4899ff9470734f0593bbe1f5272bc3d23facf7f7 (patch) | |
tree | 929b1674e445726b50e3ff2acc1e5706e9b8f5ea /py/builtin.h | |
parent | 7a9d0c454076b6524f3f6f5af9a6b28bc35da2f9 (diff) | |
parent | 36c4499d36a36ab3e1a68545e613bce61fb15f3c (diff) |
Merge branch 'str-repr' of github.com:pfalcon/micropython into pfalcon-str-repr
Conflicts:
tests/basics/tests/exception1.py
Diffstat (limited to 'py/builtin.h')
-rw-r--r-- | py/builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/py/builtin.h b/py/builtin.h index 7d001341a..f4038b47b 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -25,3 +25,4 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_range_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_repr_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sorted_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sum_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_str_obj); |