projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 943975c a9a09f0)
Merge remote-tracking branch 'origin/master' appcode/140.1285 clion/140.1288 idea/140.1295 phpstorm/140.1293 pycharm/140.1286 rubymine/140.1292 webstorm/140.1291 webstorm/140.1296
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 23 Dec 2014 01:11:10 +0000 (02:11 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 23 Dec 2014 01:11:10 +0000 (02:11 +0100)
1  2 
python/helpers/pydev/pydevd.py patch | diff1 | diff2 | blob | history

diff --cc python/helpers/pydev/pydevd.py
Simple merge
IntelliJ IDEA Community Edition and IntelliJ Platform.