projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f2c718 5c3bc4b)
Merge branch 'statimp'
authorpeter <peter.gromov@jetbrains.com>
Thu, 26 Aug 2010 19:33:55 +0000 (20:33 +0100)
committerpeter <peter.gromov@jetbrains.com>
Thu, 26 Aug 2010 19:33:55 +0000 (20:33 +0100)
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.