1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Arduino/hardware/arduino
Cristian Maglie 0824abfee5 Merge branch 'master' into ide-1.5.x
Conflicts:
	hardware/arduino/cores/arduino/HardwareSerial.cpp
	hardware/arduino/cores/robot/Arduino.h
2014-10-21 17:47:59 +02:00
..
avr Merge branch 'master' into ide-1.5.x 2014-10-21 17:47:59 +02:00
sam Merge pull request #2330 from spiritinlife/ide-1.5.x 2014-10-01 13:29:29 +02:00