Merge branch 'master' into mikhail.golubev/json-preview
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 3 Sep 2014 11:02:24 +0000 (15:02 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 3 Sep 2014 11:02:24 +0000 (15:02 +0400)
Conflicts:
community-main.iml

1  2 
community-main.iml
resources/src/idea/RichPlatformPlugin.xml

index 6d76dc43b6853730733f51ad274dcdf27c41dc92,a42803e931d21a012abb465ad8b2daf876419ddc..98b163ed9224a749e9c866fee2dbcbcc0a71d6ae
      <orderEntry type="module" module-name="structuralsearch-java" />
      <orderEntry type="module" module-name="structuralsearch-tests" scope="TEST" />
      <orderEntry type="module" module-name="structuralsearch-groovy" />
 +    <orderEntry type="module" module-name="json" />
 +    <orderEntry type="module" module-name="json-tests" scope="TEST" />
+     <orderEntry type="module" module-name="typeMigration" />
    </component>
  </module>