Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Sep 2016 16:13:24 +0000 (18:13 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Sep 2016 16:13:24 +0000 (18:13 +0200)
spellchecker/src/com/intellij/spellchecker/jetbrains.dic

index e373fd15b49191c0278b9a03581c299444ad59e5..fab17b9ef9b05ee6b9b87ab7fca9a95628e47fc4 100644 (file)
@@ -318,6 +318,7 @@ lvalue
 lvalues
 macrodef
 makefile
+makefiles
 maxdatafiles
 maxextents
 maximizable