Merge remote-tracking branch 'origin/master' into skr-merge
authorkskrygan <kirillskrygan@gmail.com>
Wed, 25 Jan 2017 19:55:29 +0000 (20:55 +0100)
committerkskrygan <kirillskrygan@gmail.com>
Wed, 25 Jan 2017 19:55:29 +0000 (20:55 +0100)
# Conflicts:
# platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java

1  2 
platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java
platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java
platform/platform-resources/src/META-INF/LangExtensions.xml
platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java