projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02f9545 45c4d62)
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 patch | diff1 | diff2 | blob | history
resources/src/META-INF/IdeaPlugin.xml patch | diff1 | diff2 | blob | history

diff --cc resources/src/META-INF/IdeaPlugin.xml
Simple merge
IntelliJ IDEA Community Edition and IntelliJ Platform.