1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Arduino/libraries
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
..
EEPROM Changed all .pde examples to .ino 2011-08-30 15:33:32 -04:00
Ethernet Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
Firmata Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
LiquidCrystal Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
Mouse/examples/JoystickMouseControl Added joystick mouse control example in libraries/Mouse/examples 2011-09-15 19:37:20 -04:00
SD Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
Servo Changed all .pde examples to .ino 2011-08-30 15:33:32 -04:00
SoftwareSerial Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
SPI Fixing warnings in Ethernet library (Paul Stoffregen). 2011-10-02 10:17:33 -04:00
Stepper Changed all .pde examples to .ino 2011-08-30 15:33:32 -04:00
Wire Fixing more warnings (Paul Stoffregen). 2011-10-10 11:28:44 -04:00