projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92534f9 0b10403)
Merge remote-tracking branch 'remotes/origin/pdolgov/moveReturnToComputation'
authorPavel Dolgov <pavel.dolgov@jetbrains.com>
Wed, 7 Sep 2016 14:21:40 +0000 (17:21 +0300)
committerPavel Dolgov <pavel.dolgov@jetbrains.com>
Wed, 7 Sep 2016 14:21:40 +0000 (17:21 +0300)
1  2 
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.