Merge branch 'master' of github.com:processing/processing

This commit is contained in:
Ben Fry
2013-03-15 11:08:02 -04:00
198 changed files with 28945 additions and 800 deletions
+9 -9
View File
@@ -236,23 +236,23 @@ editor.token.function2.style = #006699,plain
editor.token.function3.style = #669900,plain
editor.token.function4.style = #006699,bold
editor.token.keyword1.style = #72a7c2,plain
editor.token.keyword2.style = #72a7c2,plain
editor.token.keyword1.style = #33997e,plain
editor.token.keyword2.style = #33997e,plain
editor.token.keyword3.style = #669900,plain
editor.token.keyword4.style = #ff6699,plain
editor.token.keyword5.style = #e37139,plain
editor.token.keyword4.style = #d94a7a,plain
editor.token.keyword5.style = #e2661a,plain
editor.token.literal1.style = #7D4793,plain
editor.token.literal2.style = #617952,plain
editor.token.literal2.style = #718a62,plain
editor.token.operator.style = #006699,plain
editor.token.label.style = #7e7e7e,bold
editor.token.label.style = #666666,bold
editor.token.comment1.style = #7e7e7e,plain
editor.token.comment2.style = #7e7e7e,plain
editor.token.comment1.style = #666666,plain
editor.token.comment2.style = #666666,plain
editor.token.invalid.style = #7e7e7e,bold
editor.token.invalid.style = #666666,bold
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!