Merge remote-tracking branch 'origin/master' into numpy-array-view
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Fri, 10 Oct 2014 10:31:04 +0000 (14:31 +0400)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Fri, 10 Oct 2014 10:31:04 +0000 (14:31 +0400)
commitf41076d8e7fcfa7c7d8d2018a2e8aa610846a234
treee153fcee628921ad9eaba23229af8c3595643cfe
parent1ea77b975cfd0b571d332041c0f1030e587ba48d
parent3eb7cde075f282c3aada0f9b739ed6d5035c0fe1
Merge remote-tracking branch 'origin/master' into numpy-array-view
platform/platform-resources-en/src/messages/ActionsBundle.properties
python/helpers/pydev/pydevd_vars.py
python/src/META-INF/python-core.xml