diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-09-11 17:36:10 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-09-11 17:36:10 -0700 |
| commit | 5a655e2cff9322a53be12b94495aa52b77d89474 (patch) | |
| tree | 239871fac9f092dd1cc12924ca77f94d06c6d23a /.idea | |
| parent | 11f06be13362de748aad78f102be184b2dd1d2a8 (diff) | |
| parent | a28de544d7f6bae0c637a1f8175ea613a976c52e (diff) | |
| download | idea-5a655e2cff9322a53be12b94495aa52b77d89474.tar.gz | |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Conflicts:
build.xml
plugins/gradle/src/org/jetbrains/plugins/gradle/GradleManager.java
plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleProjectSettings.java
Change-Id: Ic929fbfc5b4784fdfacafafa1f7843cf62ca284f
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/inspectionProfiles/idea_default.xml | 3 | ||||
| -rw-r--r-- | .idea/inspectionProfiles/idea_default_no_spellchecker.xml | 3 | ||||
| -rw-r--r-- | .idea/modules.xml | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index 52f7c31cf56a..41d793ad951c 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -347,9 +347,6 @@ </inspection_tool> <inspection_tool class="OctalIntegerJS" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PointcutMethodStyleInspection" enabled="false" level="WARNING" enabled_by_default="false" /> - <inspection_tool class="PointlessArithmeticExpression" enabled="true" level="WARNING" enabled_by_default="true"> - <option name="m_ignoreExpressionsContainingConstants" value="true" /> - </inspection_tool> <inspection_tool class="PointlessArithmeticExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PointlessBinding" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PointlessBitwiseExpressionJS" enabled="false" level="WARNING" enabled_by_default="false"> diff --git a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml index 1048466dfe80..1c1b7332bd49 100644 --- a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml +++ b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml @@ -510,9 +510,6 @@ <inspection_tool class="PhpUnusedLocalVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PhpUnusedPrivateFieldInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PointcutMethodStyleInspection" enabled="false" level="WARNING" enabled_by_default="false" /> - <inspection_tool class="PointlessArithmeticExpression" enabled="true" level="WARNING" enabled_by_default="true"> - <option name="m_ignoreExpressionsContainingConstants" value="true" /> - </inspection_tool> <inspection_tool class="PointlessArithmeticExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PointlessBinding" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PointlessBitwiseExpressionJS" enabled="false" level="WARNING" enabled_by_default="false"> diff --git a/.idea/modules.xml b/.idea/modules.xml index 5b0d4a9a8faf..c845b97f2a03 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -57,6 +57,8 @@ <module fileurl="file://$PROJECT_DIR$/../base/device_validator/dvlib/dvlib.iml" filepath="$PROJECT_DIR$/../base/device_validator/dvlib/dvlib.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/eclipse.iml" filepath="$PROJECT_DIR$/plugins/eclipse/eclipse.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml" group="plugins" /> + <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" filepath="$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" /> + <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" filepath="$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" /> <module fileurl="file://$PROJECT_DIR$/java/execution/impl/execution-impl.iml" filepath="$PROJECT_DIR$/java/execution/impl/execution-impl.iml" group="java" /> <module fileurl="file://$PROJECT_DIR$/java/execution/openapi/execution-openapi.iml" filepath="$PROJECT_DIR$/java/execution/openapi/execution-openapi.iml" group="java" /> <module fileurl="file://$PROJECT_DIR$/platform/extensions/extensions.iml" filepath="$PROJECT_DIR$/platform/extensions/extensions.iml" group="platform" /> @@ -183,8 +185,6 @@ <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" /> - <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" filepath="$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" /> - <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-impl/editor-ui-impl.iml" filepath="$PROJECT_DIR$/platform/editor-ui-impl/editor-ui-impl.iml" /> </modules> </component> </project> |