Zach Eveland df9835efaf Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot ... Conflicts: app/src/processing/app/Editor.java app/src/processing/app/Sketch.java build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde build/shared/lib/theme/theme.txt hardware/arduino/cores/arduino/HardwareSerial.h hardware/arduino/cores/arduino/Print.cpp hardware/arduino/cores/arduino/WString.h hardware/arduino/variants/mega/pins_arduino.h libraries/Ethernet/examples/PachubeClient/PachubeClient.ino libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino libraries/Firmata/examples/EchoString/EchoString.ino libraries/SD/File.cpp libraries/SoftwareSerial/SoftwareSerial.cpp libraries/SoftwareSerial/SoftwareSerial.h libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino libraries/SoftwareSerial/keywords.txt		2011-10-27 09:32:27 -04:00
..
dist	fixed typo in INF's device description	2011-09-13 20:46:53 -04:00
launcher	Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino"	2011-02-25 18:23:34 -05:00
avr_tools.zip	Updating to avrdude 5.11 (Windows). stk500 -> arduino in boards.txt.	2011-09-02 19:57:29 -04:00
eeprom.h	Fixing same eeprom.h problem on Windows.	2011-09-28 17:23:44 -04:00
jre.zip	Updating to Java 6u16 (from Processing rev. 5883).	2009-12-27 01:04:16 +00:00