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)
1  2 
platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java