diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-06-10 18:44:01 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-06-10 18:44:01 -0700 |
| commit | a262cd22c7721801b23fc2110628528a2b2161ee (patch) | |
| tree | 730858b253b75d4c79f3a5be007d96fcef6df44a /.idea | |
| parent | ebae45aa9834b169df939c5d70d37be853ee4bba (diff) | |
| parent | 9ea67227e8fdcf8ed37e65bb96e32767291d0f4f (diff) | |
| download | idea-a262cd22c7721801b23fc2110628528a2b2161ee.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/layouts.gant
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
Change-Id: Ic1bd5a256d432347bb300789049df6e7149ed6db
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/libraries/KotlinJavaRuntime.xml | 11 | ||||
| -rw-r--r-- | .idea/modules.xml | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml new file mode 100644 index 000000000000..e89a0a33a6bb --- /dev/null +++ b/.idea/libraries/KotlinJavaRuntime.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="KotlinJavaRuntime"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/build/kotlinc/lib/kotlin-runtime.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$PROJECT_DIR$/build/kotlinc/lib/kotlin-runtime-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index de3de61d3d81..600392beba22 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -10,6 +10,7 @@ <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-tests/IntelliLang-tests.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-tests/IntelliLang-tests.iml" group="plugins/IntelliLang" /> <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" group="plugins/IntelliLang" /> <module fileurl="file://$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" filepath="$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" group="platform" /> + <module fileurl="file://$PROJECT_DIR$/plugins/ShortcutPromoter/ShortcutPromoter.iml" filepath="$PROJECT_DIR$/plugins/ShortcutPromoter/ShortcutPromoter.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/../adt/idea/adt-branding/adt-branding.iml" filepath="$PROJECT_DIR$/../adt/idea/adt-branding/adt-branding.iml" group="plugins/Android" /> <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" filepath="$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" group="platform" /> |