Merge branch 'multiline-console' of https://github.com/fitermay/intellij-community...
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Oct 2016 02:27:08 +0000 (04:27 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Oct 2016 02:27:08 +0000 (04:27 +0200)
commit1f06bd66638563448d44145bd71c215573ddc8e5
tree58a6792f96c21c9f0363306abb8a5fc1da8ef571
parenta5d99f602a01785fe617b3bfcebe6fe9209d57bb
parent03ccfc0ef8c6c53443e255e15afe8d5bb564cdfc
Merge branch 'multiline-console' of https://github.com/fitermay/intellij-community into traff/console-rework4
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
python/ide/src/META-INF/pycharm-core.xml
python/src/META-INF/python-core-common.xml