diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-08 23:11:51 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-08 23:11:51 +0100 |
| commit | 803b9263ab1049d19d62d9a09e5f82084b7afa41 (patch) | |
| tree | 1f97f3f4a1fabea34327d1af4db520a348f29dbe /py/qstrdefs.h | |
| parent | eec91057b827013a3e02c51b60e46c8597295132 (diff) | |
| parent | a985b4593d3f0c788c5e6ef0066bf82ae550cfb8 (diff) | |
| download | micropython-803b9263ab1049d19d62d9a09e5f82084b7afa41.tar.gz micropython-803b9263ab1049d19d62d9a09e5f82084b7afa41.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/qstrdefs.h')
| -rw-r--r-- | py/qstrdefs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 29eb51d0ba..0c2c032f29 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -96,6 +96,7 @@ Q(eval) Q(exec) Q(filter) Q(float) +Q(from_bytes) Q(getattr) Q(globals) Q(hash) @@ -127,6 +128,7 @@ Q(sum) Q(super) Q(str) Q(sys) +Q(to_bytes) Q(tuple) Q(type) Q(value) |