Merge branch 'pyqt5_python34'

Conflicts: firmwares/car_robot/car_robot.ino firmwares/xybot/xybot.ino mDrawGui/HexDownloader.py mDrawGui/SerialCom.py mDrawGui/XY.hex mDrawGui/mDraw.py
Makeblock-official · Jul 4, 2015 · 392fdea · 392fdea
2 parents 4719bb5 + f8ab2c7
commit 392fdea
Show file tree

Hide file tree

Showing 85 changed files with 69,523 additions and 48,256 deletions.
diff --git a/firmwares/carRobotHermit/carRobotHermit.ino b/firmwares/carRobotHermit/carRobotHermit.ino