mirror of https://github.com/noisymime/Arduino.git
Merge branch 'master' into ide-1.5.x
Conflicts: build/windows/dist/drivers/arduino.cat
This commit is contained in:
commit
e50b0ec030
Conflicts: build/windows/dist/drivers/arduino.cat