1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Arduino/build
Cristian Maglie 6c4f7dc293 Merge branch 'master' into ide-1.5.x
Conflicts:
	hardware/arduino/cores/arduino/wiring.c
	libraries/Ethernet/src/utility/util.h
	libraries/Ethernet/src/utility/w5100.cpp
	libraries/Ethernet/src/utility/w5100.h
	libraries/Ethernet/util.h
	libraries/Ethernet/utility/util.h
	libraries/SPI/SPI.cpp
	libraries/SPI/SPI.h
2014-12-02 22:35:17 +01:00
..
cmd Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
javadoc jssc: updated config files (eclipse, ant build.xml, windows launcher, mac template.app), removed rxtx binaries 2013-11-28 17:27:13 +01:00
linux Updated arm gcc to version 4.8.3-2014q1 2014-06-25 11:59:47 +02:00
macosx arduino-core project is now correctly compiled through ant build script 2014-11-13 16:34:24 +01:00
shared Merge branch 'master' into ide-1.5.x 2014-12-02 22:35:17 +01:00
windows windows: missing jar in config.xml 2014-11-25 11:46:14 +01:00
build_pull_request.bash PR Autobuild: removed useless final echos 2014-08-25 18:19:05 +02:00
build.xml Upgrading libastyle to 2.05 2014-11-21 11:07:30 +01:00
create_reference.pl Including String and Stream methods in local reference. 2012-07-15 09:34:59 -04:00
fetch.sh Updating reference (and reference-fetching scripts). 2010-12-23 19:08:09 -06:00
howto.txt fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
libastylej-2.05.zip.sha Upgrading libastyle to 2.05 2014-11-21 11:07:30 +01:00