Merge branch 'master' into codeStyleExtractor
authorjamesbrain <marso.des@gmail.com>
Thu, 1 Oct 2015 12:29:10 +0000 (15:29 +0300)
committerjamesbrain <marso.des@gmail.com>
Thu, 1 Oct 2015 12:29:10 +0000 (15:29 +0300)
1  2 
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
resources/src/META-INF/IdeaPlugin.xml

Simple merge