Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 27 Sep 2016 14:07:43 +0000 (16:07 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 27 Sep 2016 14:07:43 +0000 (16:07 +0200)
spellchecker/src/com/intellij/spellchecker/jetbrains.dic

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