projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 828cb69 706f841)
Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 17 Apr 2010 10:44:40 +0000 (14:44 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 17 Apr 2010 10:44:40 +0000 (14:44 +0400)
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.