Merge remote-tracking branch 'origin/master' into numpy-array-view
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 4 Sep 2014 08:21:06 +0000 (12:21 +0400)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 4 Sep 2014 08:21:06 +0000 (12:21 +0400)
1  2 
platform/platform-resources-en/src/messages/ActionsBundle.properties
python/helpers/pydev/pydevd_resolver.py
python/helpers/pydev/pydevd_vars.py
python/src/META-INF/python-core.xml

Simple merge
Simple merge