Commit Graph

12 Commits

Author SHA1 Message Date
Fede85 518c5a0fad missing paragraph field in library.properties 2014-07-18 20:08:01 +02:00
Fede85 4fa3f300b7 modified sentences in library.properties files 2014-07-18 19:41:34 +02:00
Cristian Maglie 41975bf4f9 Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	build/shared/examples/01.Basics/Blink/Blink.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
	hardware/arduino/cores/arduino/HardwareSerial.cpp
2014-05-23 21:04:47 +02:00
Cristian Maglie c0630cf9bf Revert "SoftwareSerial library to the new format"
This reverts commit 38c3bbbd3c83eda057d4857635fbd78a4785c3a4.
2013-11-15 12:54:59 +01:00
Fede85 bee4dbee7f SoftwareSerial library to the new format 2013-07-03 23:18:21 +02:00
Cristian Maglie 2312a1aad2 Merged 1.0.5 2013-05-29 18:30:36 +02:00
Cristian Maglie d52452d846 Merged 1.0.3 2012-12-10 15:55:05 +01:00
Federico Fissore 61eace3a23 fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
Cristian Maglie 599e7eee69 Merged upstream Arduino master branch 2012-06-26 00:51:35 +02:00
Cristian Maglie 828076175e Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +02:00
Cristian Maglie 49d12c697e Pre-merge upstream Arduino 2012-05-22 11:23:47 +02:00
Cristian Maglie 6fa8a84983 Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00