Revert "Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_p...
commitbc8ccb7be7f7bc30cf7ff9ad2ee68aee7b8cbef5
authorCorvus Corax <corvuscorax@cybertrench.com>
Sat, 16 Aug 2014 21:59:37 +0000 (16 23:59 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Sat, 16 Aug 2014 21:59:37 +0000 (16 23:59 +0200)
tree8851a492197ddda3c36c7aab90b61e41852ebdc0
parentc620c7fc2937d5d054f7ce3130d8d62a37b77424
Revert "Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next""

This reverts commit 449653f01e4221f104579d47b25e2b0d9664a890.
ground/openpilotgcs/src/python.pri
make/tools.mk