rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-11 00:52:21 +01:00
Code Issues Releases Activity
Arduino/build/shared
History
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
..
examples
Merge branch 'master' into ide-1.5.x
2014-12-02 22:35:17 +01:00
icons
Add icons
2013-12-07 19:39:45 +01:00
lib
Renamed preferences 'save.verifyUpload' to 'editor.save_on_verify'
2014-11-09 20:44:12 +01:00
tools
Updated/corrected location of tool in sketchbook folder.
2013-03-18 13:42:09 +01:00
manpage.adoc
Removed --no-op from CLI. Preferences now not-saved by default.
2014-08-22 15:39:33 +02:00
reference.zip
Including String and Stream methods in local reference.
2012-07-15 09:34:59 -04:00
revisions.txt
Merge branch 'master' into ide-1.5.x
2014-12-02 22:35:17 +01:00