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/objtuple.h | |
parent | 7a9d0c454076b6524f3f6f5af9a6b28bc35da2f9 (diff) | |
parent | 36c4499d36a36ab3e1a68545e613bce61fb15f3c (diff) | |
download | micropython-4899ff9470734f0593bbe1f5272bc3d23facf7f7.tar.gz micropython-4899ff9470734f0593bbe1f5272bc3d23facf7f7.zip |
Merge branch 'str-repr' of github.com:pfalcon/micropython into pfalcon-str-repr
Conflicts:
tests/basics/tests/exception1.py
Diffstat (limited to 'py/objtuple.h')
-rw-r--r-- | py/objtuple.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objtuple.h b/py/objtuple.h index 9c672fe3f5..6ff38c10eb 100644 --- a/py/objtuple.h +++ b/py/objtuple.h @@ -4,4 +4,4 @@ typedef struct _mp_obj_tuple_t { mp_obj_t items[]; } mp_obj_tuple_t; -void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in); +void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind); |