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)
commitc1aa5e5738a206a955ccb470508cea12012f6c45
tree3a837ae1a940064abad2cd3d4b881459b9af7aca
parent1279724a481164718d7a09aae2ac64b08f1fa15b
parenta98996ffd28965e6417a1d17e4f04c0bba1f23a0
Merge remote-tracking branch 'origin/master'

Conflicts:
community-resources/src/idea/IdeaApplicationInfo.xml
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