Cristian Maglie 44bcd2040b Merge branch 'master' into ide-1.5.x ...

Conflicts:
	app/src/processing/app/Base.java
	build/build.xml
	todo.txt

2014-09-16 12:19:39 +02:00

..

arduinoISP

added support for the ArduinoISP

2014-07-02 15:03:12 +02:00

atmegaxxu2

Merge branch 'master' into ide-1.5.x

2014-09-16 12:19:39 +02:00

wifishield

Update ArduinoWifiShield_upgrade_mac.sh

2014-07-01 19:11:19 +02:00