diff options
| author | Tony DiCola <tony@tonydicola.com> | 2016-10-20 23:01:13 +0000 |
|---|---|---|
| committer | Tony DiCola <tony@tonydicola.com> | 2016-10-20 23:01:13 +0000 |
| commit | 00a44fa36cd1e35a438c4b89b5cef0bc82787c7a (patch) | |
| tree | 4800a6984902e043e3fc437adcdfcd665f83e220 /docs/reference/index.rst | |
| parent | 1f13f870b8f6554d9cd5570de221a6886e065b64 (diff) | |
| parent | 3967ca7390ff8257728ef6237b93977b63bde41d (diff) | |
Merge remote-tracking branch 'micropython/master'
Conflicts:
README.md - Kept Adafruit README.md intact.
py/emitglue.c - Added xtensa architecture as an OR of the define.
zephyr/README.md - Fixed spelling mistake.
Diffstat (limited to 'docs/reference/index.rst')
| -rw-r--r-- | docs/reference/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/reference/index.rst b/docs/reference/index.rst index ae8d6530a..7a85fc5cf 100644 --- a/docs/reference/index.rst +++ b/docs/reference/index.rst @@ -15,6 +15,7 @@ MicroPython are described in the sections here. repl.rst isr_rules.rst speed_python.rst + constrained.rst .. only:: port_pyboard |