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
..
eightanaloginputs	Distinguishing those boards with eight analog inputs (Fio, BT, Nano, Mini).	2011-08-23 17:29:20 -04:00
leonardo	updated pin assignment again based on design files for Leonardo	2011-09-16 16:12:39 -04:00
mega	Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot	2011-10-27 09:32:27 -04:00
micro	added compile-time definition of sketch PID. PID is pulled from variants/leonardo or the new variants/micro as appropriate.	2011-09-08 15:52:05 -04:00
standard	Renaming pins/ directory to the more generic variants/	2011-08-23 17:07:39 -04:00