diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /java/structuralsearch-java/structuralsearch-java.iml | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'java/structuralsearch-java/structuralsearch-java.iml')
-rw-r--r-- | java/structuralsearch-java/structuralsearch-java.iml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/java/structuralsearch-java/structuralsearch-java.iml b/java/structuralsearch-java/structuralsearch-java.iml new file mode 100644 index 000000000000..4b2ec18c28e6 --- /dev/null +++ b/java/structuralsearch-java/structuralsearch-java.iml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="structuralsearch" /> + <orderEntry type="module" module-name="lang-impl" /> + <orderEntry type="module" module-name="openapi" /> + <orderEntry type="module" module-name="java-impl" /> + <orderEntry type="module" module-name="duplicates-analysis" /> + </component> +</module> + |