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)
commit8d9ba4d4ac8da2da9273a45d46530ff87627aeae
tree3c56b277b27e4160af62815b04202937727c0b71
parentb2b9582d332655c0134589b1785f4c792a00d3fe
parenta6b194f5e69fc0f84f369e4e245d56240e54933e
Merge remote-tracking branch 'origin/master' into numpy-array-view
platform/platform-resources-en/src/messages/ActionsBundle.properties
python/helpers/pydev/pydevd_vars.py