Merge branch 'master' into python-3.3-to-3.5

This commit is contained in:
rocky
2024-11-28 07:30:16 -05:00

View File

@@ -1,7 +1,7 @@
#/bin/bash
uncompyle6_merge_33_owd=$(pwd)
uncompyle6_merge_36_owd=$(pwd)
cd $(dirname ${BASH_SOURCE[0]})
if . ./setup-python-3.3.sh; then
if . ./setup-python-3.6.sh; then
git merge master
fi
cd $uncompyle6_merge_33_owd
cd $uncompyle6_merge_36_owd