1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Arduino/app
Zach Eveland f2bd8a5394 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot
Conflicts:
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
2011-10-27 11:41:02 -04:00
..
.settings Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
lib Reapplying Christian's regex patch. 2010-10-03 19:44:28 -04:00
src/processing/app Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 11:41:02 -04:00
.classpath Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
.classpath_macosx Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
.classpath_vista Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
.project Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
build.xml Enabling debugging for compilation of the app. 2010-11-27 11:54:07 -06:00