Cristian Maglie
|
3a1b7ea362
|
Merge branch 'master' into ide-1.5.x. Updated revision log.
Conflicts:
build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
hardware/arduino/boards.txt
|
2014-10-01 13:59:32 +02:00 |
|
Robert Allen
|
d3f76e9558
|
Fix typo in KeyboardLogout.ino
Comment says ALT+s, code says ALT+l. This remedies that difference.
|
2014-09-26 12:51:10 -07:00 |
|
Federico Fissore
|
b4c68b3dff
|
Run new astyle formatter against all the examples
|
2013-10-21 09:58:40 +02: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 |
|