Dmitry Lomov ce976c8919 Merge branch 'master' into upsource-master ...

Conflicts:
	platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java

2012-06-14 18:17:23 +02:00

..

src

Merge branch 'master' into upsource-master

2012-06-14 18:17:23 +02:00

testData/inspection

…

testSrc/com/intellij/spellchecker/inspection

…

java-i18n.iml

spell checker refactored nafig, part 2: tokenizer receives a TokenConsumer instead of returning an array of tokens; use names validator from the right language to check if an element is a keyword instead of asking all of them

2011-10-13 10:34:35 +02:00