Merge remote-tracking branch 'origin/master' into numpy-array-view
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 11 Sep 2014 12:07:36 +0000 (16:07 +0400)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 11 Sep 2014 12:07:36 +0000 (16:07 +0400)
Conflicts:
python/helpers/pydev/pydevd_vars.py
python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java

1  2 
python/helpers/pydev/pydevd_vars.py
python/src/META-INF/python-core.xml

Simple merge
Simple merge