Merge remote-tracking branch 'origin/master' into amakeev/attach-tests
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 29 Dec 2015 15:42:43 +0000 (16:42 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 29 Dec 2015 15:42:43 +0000 (16:42 +0100)
commitfcb83b346c986991ea62ce367c667aa03f3647ab
tree294c389754d31fa370b951330d9156457a3c4f13
parent32f76dc793c58d6c8af9ae484918f110fe1c4e44
parentf5ad942a0d7010ed421742541d92536141c80c44
Merge remote-tracking branch 'origin/master' into amakeev/attach-tests
platform/platform-resources-en/src/messages/XDebuggerBundle.properties