Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java

...

This commit is contained in:

Anna Kozlova

2015-01-15 17:30:58 +01:00

parent a9c9950d0d 9b2871ea39

commit 727dcdd83c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available