Skip to content

Commit

Permalink
Merge branch 'master' into ide-1.5.x. Updated revision log.
Browse files Browse the repository at this point in the history
Conflicts:
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	hardware/arduino/boards.txt
  • Loading branch information
cmaglie committed Oct 1, 2014
2 parents 3687289 + ad0bedc commit 3a1b7ea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void loop() {
Keyboard.press(KEY_DELETE);
delay(100);
Keyboard.releaseAll();
//ALT-s:
//ALT-l:
delay(2000);
Keyboard.press(KEY_LEFT_ALT);
Keyboard.press('l');
Expand Down
5 changes: 4 additions & 1 deletion build/shared/revisions.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
ARDUINO 1.5.8 BETA - not yet released
ARDUINO 1.5.8 BETA - 2014.10.01

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

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

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

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

Expand Down

0 comments on commit 3a1b7ea

Please sign in to comment.