MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upsource-master

Browse Source 
Conflicts:
	platform/core-impl/src/com/intellij/psi/stubs/StubTree.java
	platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
	platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java
This commit is contained in:
Evgeny Pasynkov
2012-06-06 12:20:51 +02:00
parent a9945f9836 041e6f9a12
commit 3ca00eb8c8
1451 changed files with 236228 additions and 5810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/java-impl.iml
+1
View File
@@ -32,6 +32,7 @@
<orderEntry type="module" module-name="java-psi-impl" exported="" />
<orderEntry type="module" module-name="RegExpSupport" />
<orderEntry type="module" module-name="java-indexing-impl" exported="" />
<orderEntry type="module" module-name="idea" />
</component>
<component name="copyright">
<Base>