Merge branch 'east825/google-code-style-docstrings'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 15 Sep 2015 12:43:10 +0000 (15:43 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 15 Sep 2015 13:13:22 +0000 (16:13 +0300)
commit956587f1d38d9e7e23915bd102e0ed8800466bd7
tree8ed7145e30a459d893b467950059a46ecdc8b490
parent48a70c25ca43b3f62a14f5e11036d4c6f1c0d0ae
parentafb33f77e8386ca87a8508bc991a5ed2a6e31e05
Merge branch 'east825/google-code-style-docstrings'

Conflicts:
python/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java
python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java
python/src/com/jetbrains/python/psi/impl/PyFunctionBuilder.java
python/testData/quickdoc/NumPyOnesDoc.html
20 files changed:
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/PyBundle.properties
python/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java
python/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java
python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java
python/src/com/jetbrains/python/inspections/quickfix/PyRemoveParameterQuickFix.java
python/src/com/jetbrains/python/psi/PyUtil.java
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
python/src/com/jetbrains/python/psi/impl/PyFunctionBuilder.java
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
python/testData/quickdoc/NumPyOnesDoc.html
python/testData/refactoring/move/moduleToNonPackage/after/src/nonp3/__init__.py
python/testData/refactoring/move/newModule/after/src/b.py
python/testSrc/com/jetbrains/python/PyQuickDocTest.java
python/testSrc/com/jetbrains/python/PyQuickFixTest.java
python/testSrc/com/jetbrains/python/PythonHighlightingTest.java
python/testSrc/com/jetbrains/python/PythonInspectionsTest.java