diff options
| author | Siva Velusamy <vsiva@google.com> | 2013-12-05 13:10:05 -0800 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2013-12-05 13:10:05 -0800 |
| commit | 1a3607f18453b082fb7bba0aa1032a0fcee570f6 (patch) | |
| tree | 3f01ce5d49103e6a3302520b9d1311bb712b72a2 /.idea | |
| parent | 1731fb07af8e568e4de297e36f3093dc8af5d942 (diff) | |
| download | idea-1a3607f18453b082fb7bba0aa1032a0fcee570f6.tar.gz | |
Update project corresponding to tools/build changes.
Path to manifest-merger module has changed.
Change-Id: Ibf85f412735e0e8fd31d05ce8e12d8dce2b1dd1e
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/modules.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml index 510a0dd00283..b8236e4261c4 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -123,7 +123,7 @@ <module fileurl="file://$PROJECT_DIR$/python/main_idea_python_plugin.iml" filepath="$PROJECT_DIR$/python/main_idea_python_plugin.iml" group="python" /> <module fileurl="file://$PROJECT_DIR$/python/main_pycharm_ce.iml" filepath="$PROJECT_DIR$/python/main_pycharm_ce.iml" group="python" /> <module fileurl="file://$PROJECT_DIR$/java/manifest/manifest.iml" filepath="$PROJECT_DIR$/java/manifest/manifest.iml" group="java" /> - <module fileurl="file://$PROJECT_DIR$/../base/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/../base/manifest-merger/manifest-merger.iml" group="plugins/Android/android-sdk" /> + <module fileurl="file://$PROJECT_DIR$/../base/build-system/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/../base/build-system/manifest-merger/manifest-merger.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" group="plugins/maven" /> |