Merge branch 'master' into daywalker/cmake_option_sorting
authorVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 13:07:05 +0000 (16:07 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 13:07:05 +0000 (16:07 +0300)
commitcf9ef095de815224fdc20a225c024091c60a68d0
treea04f88c9020b7a5592c6f8c9be82451863e5f961
parente08601590f50760ae93e652417dfe286fc3b174c
parent486c5f90f2d3fcf778428974f94fef201e590709
Merge branch 'master' into daywalker/cmake_option_sorting
platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java