Files
openide/python/testData/codeInsight
Mikhail Golubev d740159214 Merge remote-tracking branch 'origin/master' into mikhail.golubev/py-attribute-inference
Conflicts:
	python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
	python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
	python/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java
	python/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java
	python/testSrc/com/jetbrains/python/PythonCompletionTest.java
	python/testSrc/com/jetbrains/python/codeInsight/PyClassMROTest.java
2014-12-25 15:32:43 +03:00
..