1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Arduino/build
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
..
cmd Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
javadoc Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
linux Updating to avrdude 5.11 on Linux 64-bit. 2011-09-09 16:07:21 -04:00
macosx Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
shared Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
windows Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
build.xml Cleaning up Mac OS X ant build script (template.app copying). 2011-10-10 11:49:08 -04:00
create_reference.pl Updating reference (and reference-fetching scripts). 2010-12-23 19:08:09 -06:00
fetch.sh Updating reference (and reference-fetching scripts). 2010-12-23 19:08:09 -06:00
howto.txt Removing instructions from howto.txt and pointing to Google Code wiki page instead. 2010-01-02 16:47:57 +00:00