diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-08-21 12:41:59 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-08-21 12:41:59 -0700 |
| commit | 43c5c1d01e77f42aef66ef15893020950f84f1e9 (patch) | |
| tree | e90cd51a45e64bb63446c97e6fac207e462a4140 /community-main.iml | |
| parent | a0923715d8ff6129461ca86dc236abfe61ce3033 (diff) | |
| parent | d34b4c8d74407f5b2be1a344e41f2ecdeb25f4fe (diff) | |
| download | idea-43c5c1d01e77f42aef66ef15893020950f84f1e9.tar.gz | |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Change-Id: I2b7abb5210422ecca804c6c1182f18c4001d6695
Diffstat (limited to 'community-main.iml')
| -rw-r--r-- | community-main.iml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/community-main.iml b/community-main.iml index 9e92fe4fa40c..06e2a0a59a8b 100644 --- a/community-main.iml +++ b/community-main.iml @@ -61,11 +61,8 @@ <orderEntry type="module" module-name="ui-designer" /> <orderEntry type="module" module-name="devkit" /> <orderEntry type="module" module-name="eclipse" /> - <orderEntry type="module" module-name="generate-tostring" /> <orderEntry type="module" module-name="git4idea" /> <orderEntry type="module" module-name="images" /> - <orderEntry type="module" module-name="InspectionGadgetsPlugin" /> - <orderEntry type="module" module-name="IntentionPowerPackPlugin" /> <orderEntry type="module" module-name="jetgroovy" /> <orderEntry type="module" module-name="junit" /> <orderEntry type="module" module-name="maven" /> @@ -91,16 +88,17 @@ <orderEntry type="module" module-name="relaxng" /> <orderEntry type="module" module-name="gradle" /> <orderEntry type="module" module-name="remote-servers-impl" /> - <orderEntry type="module" module-name="xml-tests" scope="TEST" /> <orderEntry type="module" module-name="dom-tests" /> - <orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" /> - <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" /> <orderEntry type="module" module-name="colorSchemes" /> <orderEntry type="module" module-name="javaFX-CE" /> <orderEntry type="module" module-name="javaFX-jps-plugin" /> + <orderEntry type="module" module-name="IntelliLang-tests" /> + <orderEntry type="module" module-name="manifest" /> + <orderEntry type="module" module-name="xml-tests" scope="TEST" /> + <orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" /> + <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" /> <orderEntry type="module" module-name="java-tests" scope="TEST" /> <orderEntry type="module" module-name="community-tests" scope="TEST" /> - <orderEntry type="module" module-name="IntelliLang-tests" /> </component> </module> |