arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

update AVR src

Browse Source 
* java code not tested *

Merge remote-tracking branch 'remotes/arduino/master' into esp8266

Conflicts:
	README.md
	app/src/processing/app/AbstractMonitor.java
	arduino-core/src/processing/app/Serial.java
	libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
	libraries/WiFi/library.properties
This commit is contained in:
Markus Sattler
2015-06-17 14:22:59 +02:00
parent d8e22e3ca7 5b2ef53045
commit f206d31581
390 changed files with 5510 additions and 12573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/shared/lib/keywords.txt
View File

@ -67,6 +67,7 @@ public LITERAL2 RESERVED_WORD_2
short LITERAL2 RESERVED_WORD_2
signed LITERAL2 RESERVED_WORD_2
static LITERAL2 Static RESERVED_WORD_2
goto LITERAL2 RESERVED_WORD_2
String LITERAL2 String RESERVED_WORD_2
void LITERAL2 Void RESERVED_WORD_2
true LITERAL2 LITERAL_BOOLEAN

3
build/shared/lib/theme/theme.txt
View File

@ -97,10 +97,11 @@ editor.literal1.style = #006699,plain
editor.literal2.style = #00979C,plain
editor.variable.style = #00979C,plain
editor.reserved_word_2.style = #00979C,plain
editor.literal_boolean.style = #00979C,plain
editor.literal_char.style = #00979C,plain
editor.literal_string_double_quote.style = #00979C,plain
# http://arduino.cc/
# http://www.arduino.cc/
editor.url.style = #0000ff,underlined
# e.g. + - = /