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

Simple merge