1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Commit Graph

9 Commits

Author SHA1 Message Date
Zach Eveland
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
2011-10-27 11:45:13 -04:00
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
Tom Igoe
b21b43c591 deleted .pde examples 2011-08-30 17:02:55 -04:00
Tom Igoe
35777612c0 Changed all .pde examples to .ino
All examples in /build/shared/examples/ and /libraries/ have had their
extensions changed to .ino
2011-08-30 15:33:32 -04:00
Tom Igoe
7ecf9ec237 Updated Serial Communication examples with compressed versions of Max/MSP patches that accompany them. 2011-05-03 13:21:41 -04:00
David A. Mellis
6739f20bbf Modifying examples to use Serial.write() instead of Serial.print(BYTE). 2011-02-26 14:04:41 -05:00
David A. Mellis
3eae87adc9 Modifying examples to use Serial.write() instead of Serial.print(BYTE). 2011-02-26 13:57:41 -05:00
Tom Igoe
47d3b65e51 Changed analog references to use new A0 through A5 notation 2010-09-04 19:47:59 +00:00
Tom Igoe
7da6084c91 renamed examples folders 2010-07-27 02:28:07 +00:00