diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-05-28 18:42:10 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-05-28 18:42:10 -0700 |
| commit | 57ea09d1ac831e9cd0597642dab5d2c805b8e78e (patch) | |
| tree | 81daadd60ea990ea5ee7213383fb6589ed4661de /.idea | |
| parent | dc0e9a07745d26e1d40a46faee6f723b68e272f2 (diff) | |
| parent | c667c1f74abd96a2098520effdd5afdff7f0d34b (diff) | |
| download | idea-57ea09d1ac831e9cd0597642dab5d2c805b8e78e.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ModuleExtendedModel.java
plugins/groovy/src/META-INF/plugin.xml
Change-Id: Ib6de04d7226d4eb7f35f66304df68135ad6ff267
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/libraries/Netty.xml | 4 | ||||
| -rw-r--r-- | .idea/libraries/mockito.xml | 2 | ||||
| -rw-r--r-- | .idea/modules.xml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml index bc6600b3242d..c79ce3e2cbe0 100644 --- a/.idea/libraries/Netty.xml +++ b/.idea/libraries/Netty.xml @@ -1,11 +1,11 @@ <component name="libraryTable"> <library name="Netty"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/netty-all-5.0.0.Alpha2.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.0.Alpha1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$PROJECT_DIR$/lib/src/netty-all-5.0.0.Alpha2-sources.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.0.Alpha1-sources.jar!/" /> </SOURCES> </library> </component>
\ No newline at end of file diff --git a/.idea/libraries/mockito.xml b/.idea/libraries/mockito.xml index 6d3268c81801..7113f6f8f4ec 100644 --- a/.idea/libraries/mockito.xml +++ b/.idea/libraries/mockito.xml @@ -9,4 +9,4 @@ <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar!/" /> </SOURCES> </library> -</component> +</component>
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 19385b25b6dd..de3de61d3d81 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -77,6 +77,7 @@ <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" group="community/plugins/gradle" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml" group="community/plugins/gradle" /> <module fileurl="file://$PROJECT_DIR$/plugins/groovy/jps-plugin/groovy-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/groovy/jps-plugin/groovy-jps-plugin.iml" group="plugins/Groovy" /> + <module fileurl="file://$PROJECT_DIR$/plugins/groovy/groovy-psi/groovy-psi.iml" filepath="$PROJECT_DIR$/plugins/groovy/groovy-psi/groovy-psi.iml" group="plugins/Groovy" /> <module fileurl="file://$PROJECT_DIR$/plugins/groovy/rt-constants/groovy-rt-constants.iml" filepath="$PROJECT_DIR$/plugins/groovy/rt-constants/groovy-rt-constants.iml" group="plugins/Groovy" /> <module fileurl="file://$PROJECT_DIR$/plugins/groovy/rt/groovy_rt.iml" filepath="$PROJECT_DIR$/plugins/groovy/rt/groovy_rt.iml" group="plugins/Groovy" /> <module fileurl="file://$PROJECT_DIR$/plugins/hg4idea/hg4idea.iml" filepath="$PROJECT_DIR$/plugins/hg4idea/hg4idea.iml" group="plugins/VCS" /> @@ -208,6 +209,7 @@ <module fileurl="file://$PROJECT_DIR$/platform/vcs-impl/vcs-impl.iml" filepath="$PROJECT_DIR$/platform/vcs-impl/vcs-impl.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/api/vcs-log-api.iml" filepath="$PROJECT_DIR$/platform/vcs-log/api/vcs-log-api.iml" group="platform/vcs-log" /> <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/graph/vcs-log-graph.iml" filepath="$PROJECT_DIR$/platform/vcs-log/graph/vcs-log-graph.iml" group="platform/vcs-log" /> + <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/graph-api/vcs-log-graph-api.iml" filepath="$PROJECT_DIR$/platform/vcs-log/graph-api/vcs-log-graph-api.iml" group="platform/vcs-log" /> <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" group="platform/vcs-log" /> <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" /> |