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 remote-tracking branch 'origin/master' into develar/is

Browse Source 
# Conflicts:
#	java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
#	platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
This commit is contained in:
Vladimir Krivosheev
2016-07-08 10:11:44 +02:00
parent 70ccc5dd01 6d612e35a5
commit e16ce9edb4
310 changed files with 3276 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/java-tests.iml
+1 -1
View File
@@ -25,7 +25,7 @@
<orderEntry type="library" name="Velocity" level="project" />
<orderEntry type="module" module-name="java-i18n" exported="" />
<orderEntry type="module" module-name="compiler-impl" />
<orderEntry type="library" name="asm5" level="project" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="instrumentation-util" />
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="module" module-name="IntelliLang-java" scope="RUNTIME" />