Damien George 5573f9f150 Merge branch 'str2int' of github.com:xyb/micropython into xyb-str2int ...

Conflicts:
	py/objint.c
	unix-cpy/Makefile
	unix/Makefile

2014-01-15 22:58:39 +00:00

..

.gitignore

Add unix-cpy, used to test Micro Python byte code against CPython.

2013-12-29 18:01:01 +00:00

file.c

Merge branch 'str-repr' of github.com:pfalcon/micropython into pfalcon-str-repr

2014-01-15 22:39:03 +00:00

main.c

Merge branch 'str-repr' of github.com:pfalcon/micropython into pfalcon-str-repr

2014-01-15 22:39:03 +00:00

Makefile

Merge branch 'str2int' of github.com:xyb/micropython into xyb-str2int

2014-01-15 22:58:39 +00:00

mpconfigport.h

Factor and simplify Makefile's and mpconfig, part 2.

2014-01-07 15:20:33 +00:00