Merge branch 'master' of github.com:micropython/micropython

Conflicts:
	py/objstr.c
	py/py.mk
	py/stream.c
	unix/main.c
	unix/socket.c
This commit is contained in:
Damien George
2014-01-21 21:54:15 +00:00
22 changed files with 281 additions and 60 deletions

View File

@@ -40,6 +40,7 @@ Q(any)
Q(array)
Q(bool)
Q(bytearray)
Q(bytes)
Q(callable)
Q(chr)
Q(complex)