noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
403 Commits 22 Branches 1 Tag 17 MiB
C 92.6%
C++ 4.2%
Makefile 2.8%
Shell 0.2%
Assembly 0.1%
Other 0.1%
Go to file
Zach Eveland 29cfd9e9fe 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
bootloaders Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
cores/arduino Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
firmwares Minor ATmega8U2 firmware update and new .hex files. 2010-12-04 14:28:56 -05:00
variants Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
boards.txt Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
programmers.txt Moving USBasp in programmers menu. 2011-10-10 11:58:38 -04:00