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

This commit is contained in:
Damien George 2014-04-07 00:54:53 +01:00
commit 3bb8663282
2 changed files with 7 additions and 1 deletions

View File

@ -1 +1 @@
print({1}.union({2}))
print(sorted({1}.union({2})))

View File

@ -6,6 +6,12 @@
# ports (if PIP_MICROPY_DEST environment var is set).
#
if [ "$1" != "install" ]; then
echo "Only install command is supported currently"
exit 1
fi
shift
if [ -n "$PIP_MICROPY_DEST" ]; then
dest="$PIP_MICROPY_DEST"
echo "Destination snapshot directory: $dest"