Merge branch 'akoshevoy/path_mappers'
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 7 Aug 2015 13:51:37 +0000 (16:51 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 7 Aug 2015 13:51:37 +0000 (16:51 +0300)
commitea7839c9538182f882057e741729251b2cb0151f
treeea0df228894d3d8e2bb12a9681d9a992fef1cfc5
parent3de28c46384c4019a15071d16ccec76539b1cd2e
parent23c6c3bb49656cb885a46bbac7f584a9f256e763
Merge branch 'akoshevoy/path_mappers'
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
python/src/com/jetbrains/python/run/PythonCommandLineState.java