1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-11 22:24:13 +01:00
Arduino/build/shared/examples
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
..
1.Basics deleted .pde examples 2011-08-30 17:02:55 -04:00
2.Digital deleted .pde examples 2011-08-30 17:02:55 -04:00
3.Analog deleted .pde examples 2011-08-30 17:02:55 -04:00
4.Communication Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
5.Control deleted .pde examples 2011-08-30 17:02:55 -04:00
6.Sensors deleted .pde examples 2011-08-30 17:02:55 -04:00
7.Display deleted .pde examples 2011-08-30 17:02:55 -04:00
8.Strings deleted .pde examples 2011-08-30 17:02:55 -04:00
ArduinoISP Changed all .pde examples to .ino 2011-08-30 15:33:32 -04:00