diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-21 21:54:15 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-21 21:54:15 +0000 |
| commit | 12eaccacda83a15500dae4616b3c37deecb57182 (patch) | |
| tree | 5ec75424388c0be9e3591f981982d891c07669cc /py/qstrdefs.h | |
| parent | 55baff4c9bcbc001cbb8972c289ebfa356d4665b (diff) | |
| parent | 7280f790881fa174e4d234266ff42f0fe3d847bc (diff) | |
| download | micropython-12eaccacda83a15500dae4616b3c37deecb57182.tar.gz micropython-12eaccacda83a15500dae4616b3c37deecb57182.zip | |
Merge branch 'master' of github.com:micropython/micropython
Conflicts:
py/objstr.c
py/py.mk
py/stream.c
unix/main.c
unix/socket.c
Diffstat (limited to 'py/qstrdefs.h')
| -rw-r--r-- | py/qstrdefs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 10b1fc0d39..9bc01c5851 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -40,6 +40,7 @@ Q(any) Q(array) Q(bool) Q(bytearray) +Q(bytes) Q(callable) Q(chr) Q(complex) |