Merge remote-tracking branch 'origin/master' into amakeev/cmake-console
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 12 Nov 2016 19:38:21 +0000 (20:38 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 12 Nov 2016 19:38:21 +0000 (20:38 +0100)
commit9d0666d1028ee6d624383575e96c04cb5ac54bd9
tree74c1a8babb349fc9dcf04fe86280994497638a75
parentd1dd7944b4472c4e18d033683ef4f5c41fddff71
parent2a7ca8f3616ec322d61b0ebd89aff0878f7dfd63
Merge remote-tracking branch 'origin/master' into amakeev/cmake-console
platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java