1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-19 08:52:15 +01:00
Cristian Maglie ab92e42259 Merge branch 'master' into ide-1.5.x
Conflicts:
	app/src/processing/app/Serial.java
	app/src/processing/app/SerialMonitor.java
2014-12-23 16:41:38 +01:00
..
2013-12-07 19:39:45 +01:00