diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /spellchecker/src/com/intellij/spellchecker/jetbrains.dic | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'spellchecker/src/com/intellij/spellchecker/jetbrains.dic')
| -rw-r--r-- | spellchecker/src/com/intellij/spellchecker/jetbrains.dic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spellchecker/src/com/intellij/spellchecker/jetbrains.dic b/spellchecker/src/com/intellij/spellchecker/jetbrains.dic index 45610cdbdf1c..7e6817c5984c 100644 --- a/spellchecker/src/com/intellij/spellchecker/jetbrains.dic +++ b/spellchecker/src/com/intellij/spellchecker/jetbrains.dic @@ -302,6 +302,7 @@ namespaces nchar nclob ndbcluster +nmtoken noarchivelog noaudit nocache @@ -538,6 +539,8 @@ taglib teamcity temptable throwable +thymeleaf +thymes timestamp tinyblob tinyint |