Merge remote-tracking branch 'origin/master'
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 29 Apr 2016 13:30:11 +0000 (16:30 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 29 Apr 2016 13:30:11 +0000 (16:30 +0300)
1  2 
build/scripts/libLicenses.gant
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java

Simple merge