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/mpqstrraw.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/mpqstrraw.h')
| -rw-r--r-- | py/mpqstrraw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/py/mpqstrraw.h b/py/mpqstrraw.h index 356c911238..6674a2c398 100644 --- a/py/mpqstrraw.h +++ b/py/mpqstrraw.h @@ -65,6 +65,7 @@ Q(repr) Q(set) Q(sorted) Q(sum) +Q(str) Q(tuple) Q(type) Q(zip) |