diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-08-23 15:59:24 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-08-23 15:59:24 +0200 |
| commit | 540743129b2badb813b703208d121ff14553c147 (patch) | |
| tree | 6fadb4ebce68e1f0cb298a282be135c23fd156ed /libraries/SPI/keywords.txt | |
| parent | 073b3ac9d4ae93ac0bb3a91afc65ae9d8f1d5d59 (diff) | |
| parent | 67c84855c2f3ce99b091a756bb2ca1a016260659 (diff) | |
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
app/src/processing/app/Preferences.java
app/src/processing/app/debug/Uploader.java
Diffstat (limited to 'libraries/SPI/keywords.txt')
| -rw-r--r-- | libraries/SPI/keywords.txt | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libraries/SPI/keywords.txt b/libraries/SPI/keywords.txt deleted file mode 100644 index fa76165..0000000 --- a/libraries/SPI/keywords.txt +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Syntax Coloring Map SPI -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -SPI KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### -begin KEYWORD2 -end KEYWORD2 -transfer KEYWORD2 -setBitOrder KEYWORD2 -setDataMode KEYWORD2 -setClockDivider KEYWORD2 - - -####################################### -# Constants (LITERAL1) -####################################### -SPI_CLOCK_DIV4 LITERAL1 -SPI_CLOCK_DIV16 LITERAL1 -SPI_CLOCK_DIV64 LITERAL1 -SPI_CLOCK_DIV128 LITERAL1 -SPI_CLOCK_DIV2 LITERAL1 -SPI_CLOCK_DIV8 LITERAL1 -SPI_CLOCK_DIV32 LITERAL1 -SPI_CLOCK_DIV64 LITERAL1 -SPI_MODE0 LITERAL1 -SPI_MODE1 LITERAL1 -SPI_MODE2 LITERAL1 -SPI_MODE3 LITERAL1
\ No newline at end of file |