rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-13 23:48:46 +01:00
Code Issues Releases Activity
3,306 Commits 7 Branches 93 Tags 2.9 GiB
3c6ee46828
Commit Graph

2 Commits

Author SHA1 Message Date
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