Merge branch 'mainline' into new-extension

build/macosx/template.app/Contents/Info.plist

@@ -7,11 +7,11 @@
 
     <!-- all these need to change for new releases -->
     <key>CFBundleGetInfoString</key>
-    <string>1.0-beta1</string>
+    <string>1.0-beta2</string>
     <key>CFBundleVersion</key>
     <string>0100</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0-beta1</string>
+    <string>1.0-beta2</string>
     <!-- now stop changing things and get outta here -->
 
     <key>CFBundleAllowMixedLocalizations</key>

build/shared/lib/keywords.txt

@@ -172,6 +172,13 @@ print	KEYWORD2	Serial_Print
 println	KEYWORD2	Serial_Println
 available	KEYWORD2	Serial_Available
 flush	KEYWORD2	Serial_Flush
+setTimeout	KEYWORD2
+find	KEYWORD2
+findUntil	KEYWORD2
+parseInt	KEYWORD2
+parseFloat	KEYWORD2
+readBytes	KEYWORD2
+readBytesUntil	KEYWORD2
 
 setup	KEYWORD3	Setup
 loop	KEYWORD3	Loop

build/shared/lib/theme/theme.txt

@@ -83,6 +83,9 @@ editor.literal1.style = #006699,plain
 # p5 built in variables: e.g. mouseX, width, pixels
 editor.literal2.style = #006699,plain
 
+# http://arduino.cc/
+editor.url.style = #0000ff,underlined
+
 # e.g. + - = /
 editor.operator.style = #000000,plain