Merge remote-tracking branch 'origin/master' into amakeev/debugger
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 24 May 2016 17:11:09 +0000 (19:11 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 24 May 2016 17:11:09 +0000 (19:11 +0200)
1  2 
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
platform/platform-resources/src/brokenPlugins.txt
platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java