summaryrefslogtreecommitdiffstatshomepage
path: root/unix-cpy
diff options
context:
space:
mode:
authorJohn R. Lenton <jlenton@gmail.com>2014-01-05 22:11:01 +0000
committerJohn R. Lenton <jlenton@gmail.com>2014-01-05 22:11:01 +0000
commit8428b8f3c94fb4adab6b094c1e0718168ebd8cbd (patch)
tree06cfd0bcfb68771884761209939c47adc8457657 /unix-cpy
parentf1c6ad46afa3eaf6df999cd51eb406110b6cac69 (diff)
parent12e2656472bf53e467c066eda6f3e177a97210ca (diff)
downloadmicropython-8428b8f3c94fb4adab6b094c1e0718168ebd8cbd.tar.gz
micropython-8428b8f3c94fb4adab6b094c1e0718168ebd8cbd.zip
Merge remote-tracking branch 'upstream/master' into list_insert
Diffstat (limited to 'unix-cpy')
-rw-r--r--unix-cpy/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/unix-cpy/Makefile b/unix-cpy/Makefile
index 7fee3438fb..a1eb9b77e4 100644
--- a/unix-cpy/Makefile
+++ b/unix-cpy/Makefile
@@ -38,6 +38,7 @@ PY_O = \
objfun.o \
objgenerator.o \
objinstance.o \
+ objint.o \
objlist.o \
objmodule.o \
objnone.o \