Skip to content

Commit 3a1b7ea

Browse files
committed
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
2 parents 3687289 + ad0bedc commit 3a1b7ea

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void loop() {
6565
Keyboard.press(KEY_DELETE);
6666
delay(100);
6767
Keyboard.releaseAll();
68-
//ALT-s:
68+
//ALT-l:
6969
delay(2000);
7070
Keyboard.press(KEY_LEFT_ALT);
7171
Keyboard.press('l');

build/shared/revisions.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
ARDUINO 1.5.8 BETA - not yet released
1+
ARDUINO 1.5.8 BETA - 2014.10.01
22

33
[ide]
44
* Find/Replace over multiple tabs (Erwin Ried, Fulvio Ieva)
55
* Fix wrong "Replace" behavior with empty "Find" field (Fulvio Ieva)
66
* A lot of command-line improvements (Matthijs Kooijman)
7+
* Cursor is not moved when invoking autoformat
78

89
[libraries]
910
* SPI: added transaction API (Paul Stoffregen)
1011
https://github.com/arduino/Arduino/pull/2223
1112
https://groups.google.com/a/arduino.cc/forum/#!msg/developers/TuZLfjeZjDI/6deNjw3Y9m4J
1213
* FileIO bridge: fixed wrong return value in File::size() for size >32768
1314
* Updated Temboo to latest version
15+
* Updates/Fix to various examples
1416

1517
[core]
1618
* sam: "new" and "delete" do not bring in 50Kb of stdclib anymore
1719
* Correct implementation of gcc specific internal functions (__cxa_guard_*) (Alexey Guseynov)
1820
* Fix for upload problems on Leonardo (and derivative boards based on mega32u4)
1921
* Small improvements on String class (Matthijs Kooijman)
2022
* Fixed size of available flash for mega2560 boards (Leonardo Milani, Arnav Gupta)
23+
* sam: removed useless empty digitalPinToTimer(..) macro stub (Bill Perry)
2124

2225
The following changes are included also in the Arduino IDE 1.0.6:
2326

0 commit comments

Comments
 (0)