Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 30 Apr 2015 19:01:59 +0000 (21:01 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 30 Apr 2015 19:01:59 +0000 (21:01 +0200)
Conflicts:
community-resources/src/idea/IdeaApplicationInfo.xml

1  2 
community-resources/src/idea/IdeaApplicationInfo.xml
platform/util/src/com/intellij/icons/AllIcons.java
platform/util/src/com/intellij/openapi/application/PathManager.java
platform/util/src/com/intellij/util/ui/UIUtil.java

index 59923082a7bb22c427919be8c398667c2f0203c6,6c7b217eb54ae0f593e32064b9f0d8608f11556e..47e01617ba824ea6ada32a5ff4839a6413f79c69
@@@ -4,8 -4,8 +4,8 @@@
    <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
    <install-over minbuild="129.1" maxbuild="139.9999" version="14"/>
    <logo url="/idea_community_logo.png" textcolor="aaaaaa" progressColor="FDA916" progressY="230" progressTailIcon="/community_progress_tail.png"/>
-   <about url="/idea_community_about.png" foreground="7A858F" copyrightForeground="7A858F" linkColor="62B6F5" logoX="300" logoY="265" logoW="75" logoH="30"/>
+   <about url="/idea_community_about.png" foreground="7A858F" copyrightForeground="7A858F" linkColor="9b5121" logoX="300" logoY="265" logoW="75" logoH="30"/>
 -  <icon size32="/icon_CE.png" size16="/icon_CEsmall.png" size32opaque="/icon_CEwhite.png" size12="/toolwindows/toolWindowProject.png" size128="/icon_CE_128.png" ico="idea_CE.ico"/>
 +  <icon size32="/icon_CE.png" size16="/icon_CEsmall.png" size12="/toolwindows/toolWindowProject.png" size128="/icon_CE_128.png" ico="idea_CE.ico"/>
    <package code="__PACKAGE_CODE__"/>
    <names product="IDEA" fullname="IntelliJ IDEA" script="idea"/>