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)
commit4ce973ad8a5120c6963abb16a1e81582b01b2a3a
tree3c5ac5c6c4c45885028335af1aae8f84ddef2275
parent31e4486834d460b48828b0b23204e75fc3134d96
parentec11e5656439366dc5196b65a544409ca07782ab
Merge remote-tracking branch 'origin/master'
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java