rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-10 21:24:12 +01:00
Code Issues Releases Activity
1,460 Commits 7 Branches 93 Tags 2.9 GiB
8f9ec88f57
Commit Graph

5 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
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
381e62e550 Added example to demonstrate LiquidCrystal chreateChar() function 2011-05-12 17:03:07 -04:00
Tom Igoe
fcb66ddccd Added example to demonstrate LiquidCrystal chreateChar() function 2011-03-21 12:27:18 -04:00