1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-05 02:29:55 +01:00

Merge branch 'master' of github.com:arduino/Arduino

This commit is contained in:
Martino Facchin 2018-03-02 12:05:33 +01:00
commit 662d66594d
2 changed files with 1 additions and 2 deletions
app/src/processing/app/syntax
build/shared

@ -115,7 +115,7 @@ public class PdeKeywords {
continue; continue;
} }
String pieces[] = line.split("\\s+", 4); String pieces[] = line.split("\t");
String keyword = pieces[0].trim(); String keyword = pieces[0].trim();
if (keyword.startsWith("\\#")) { if (keyword.startsWith("\\#")) {

@ -5,7 +5,6 @@ ARDUINO 1.8.6
* Added scroller in programmers menu. * Added scroller in programmers menu.
* Added "accelerator" in scrollable menu, press "a" key while scrolling * Added "accelerator" in scrollable menu, press "a" key while scrolling
* Keep "Board Manager" menu item always as first in the menu * Keep "Board Manager" menu item always as first in the menu
* keyword.txt now allows any whitespace. Thanks @bhagman
[wifi101-firmware] [wifi101-firmware]
* SECURITY FIX: Released fix for WPA2 KRACK vulnerability (latest WINC1500 firmware 19.5.2). * SECURITY FIX: Released fix for WPA2 KRACK vulnerability (latest WINC1500 firmware 19.5.2).