Merge branch 'master' into daywalker/cmake_option_sorting
[idea/community.git] / platform / lang-api / src / com / intellij / psi / codeStyle / presentation / CodeStyleSettingPresentation.java
2015-10-29 Vasily PisarMerge branch 'master' into daywalker/cmake_option_sorting
2015-10-28 Vasily PisarCPP-4824 Inconsistent order of settings in Code Style...
2015-10-28 Yaroslav LepenkinProvided way to align subsequent simple methods idea/144.662
2015-10-27 Vasily PisarCPP-4824 Inconsistent order of settings in Code Style...
2015-10-15 Dmitry BatkovichMerge remote-tracking branch 'origin/master'
2015-10-15 Yaroslav LepenkinAdded code style setting presentation to space settings
2015-10-13 jamesbrainMerge remote-tracking branch 'origin/master' appcode/144.313 clion/144.310 dbe/144.317 idea/144.309 phpstorm/144.311 pycharm/144.312 rubymine/144.315 webstorm/144.316
2015-10-13 jamesbrainMerge branch 'codeStyleExtractor'
2015-10-11 Roman SheinFixes from code review