Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 14 Apr 2010 08:36:19 +0000 (12:36 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 14 Apr 2010 08:36:19 +0000 (12:36 +0400)
commit255a159cfa523d172b59664e1960adade2f4e188
tree77da154c517f6d95bf56e9009759ea689896919f
parent1b1ef15a323c8432485bafa38e0c1119c77e9274
parente6a9b22f6627571701a8626ea7e498a2d46eab77
Merge branch 'master' into changeSignature
resources/src/META-INF/IdeaPlugin.xml