summaryrefslogtreecommitdiffstatshomepage
path: root/py/qstrdefs.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-05 23:04:22 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-05 23:04:22 +0100
commit09af5364d4cb0f85e51e4193565e903ca192c98b (patch)
tree76a4401b1d5d32b1f4e541414a243e58d55ab1b9 /py/qstrdefs.h
parent27e735fd1870e24595eadb02164b164a3bb81b98 (diff)
parentcc0af3d727e9f675da233ac4fd9ddc15bc41fe76 (diff)
downloadmicropython-09af5364d4cb0f85e51e4193565e903ca192c98b.tar.gz
micropython-09af5364d4cb0f85e51e4193565e903ca192c98b.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/qstrdefs.h')
-rw-r--r--py/qstrdefs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 85f69861b2..29eb51d0ba 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -97,6 +97,7 @@ Q(exec)
Q(filter)
Q(float)
Q(getattr)
+Q(globals)
Q(hash)
Q(id)
Q(io)
@@ -106,6 +107,7 @@ Q(issubclass)
Q(iter)
Q(len)
Q(list)
+Q(locals)
Q(map)
Q(max)
Q(min)