Yaroslav Lepenkin a5608eccba Merge branch 'master' into no-reformat-dialog-on-reformat-code-action
Conflicts:
	platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
	platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
	platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
2015-01-14 16:57:55 +02:00
2015-01-12 18:30:13 +01:00
S
Description
No description provided
5.8 GiB
Languages
Java 55.6%
Kotlin 29.2%
Python 8%
C 3.4%
HTML 1.7%
Other 1.5%