Merge remote-tracking branch 'origin/master' into amakeev/debugger clion/162.282
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 18 May 2016 10:45:50 +0000 (12:45 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 18 May 2016 10:45:50 +0000 (12:45 +0200)
commitb88459cff9b541e8685aba38293b72eaf854545b
tree01b656829bcc51c43e94e474afa7145c7c6a430d
parent390a1b2d8bfbbb7a9dc52a94c04536e27bf16c11
parent84717649859cc598a3783c87297d11cb4bc5ae2c
Merge remote-tracking branch 'origin/master' into amakeev/debugger
platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java