rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-03 14:24:15 +01:00
Code Issues Releases Activity
df9835efaf
Arduino/build/shared
History
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
..
examples Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
lib Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
tools Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
reference.zip Updating reference (and reference-fetching scripts). 2010-12-23 19:08:09 -06:00
revisions.txt Updating revisions.txt. 2010-12-24 13:22:07 -06:00