1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-04 15:24:12 +01:00
Commit Graph

7 Commits

Author SHA1 Message Date
Cristian Maglie
85976278e7 Merged upcoming 1.0.4
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
2013-01-23 17:26:51 +01:00
Dan Moore
07f3915d8f Removing duplicate comment from top of KeyboardAndMouseControl example code. 2013-01-17 10:56:37 -05:00
Fede85
62e48dba91 corrected a wrong comment inside the KeyboardAndMouseControl example 2013-01-15 10:37:19 +01:00
Fede85
fbdd7754ce corrected a wrong comment inside the KeyboardAndMouseControl example 2013-01-15 10:27:32 +01:00
Cristian Maglie
23c7536dc7 Merged 1.0.2
Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt
2012-11-04 22:49:14 +01:00
Scott
d6e9e03d13 Changed Leonardo only examples to "USB", added 2012-10-31 16:08:20 -04:00
Scott
68e5047736 Added keywords for new libraries, rearranged and modified Due and USB examples
Renamed Leonardo Only examples folder to USB. Modified keyboard and
Mouse examples to indicate Due compatibility.

Minor modifications to Due examples to conform with existing example
sketches.

Added keywords to for Audio, Scheduer, and USBHost libraries.
2012-10-21 12:36:54 -04:00