Merge remote-tracking branch 'origin/master' appcode/163.4764 clion/163.4763
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)
1  2 
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java