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)
commit6782bcf35846a6ef9d56e24e04483c4d74b70bf6
treeb8b351371b62f4cb83e94400322227b9012b5c8c
parentc4cafe94521123ca619988514ee1c3b461682d31
parent14da97ed798177f83c968574710bba74ba9d2fd7
Merge remote-tracking branch 'origin/master'
build/scripts/libLicenses.gant
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java