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)
commit7fb9d64e302bc2abfa81dbbc832b12becc4d5a43
tree0f12f2f41d48ab48521714b4d58eda4be0971f27
parent2b8b1bfc27361f3a3539e310829c3e6aac863601
parentd14cfcea2684d015d4c1dd3c95605e12b68e9a18
Merge remote-tracking branch 'origin/master' into numpy-array-view
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