Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:14:28 +0000 (19:14 +0300)
commit67424cae15f2660148d6e147782feeab7d03b9bc
tree10b3f85d278b1c46df8a676650d30d0d2d94ea0d
parent1bc12672eb9ac84460d02d8aa3307cd5cde7c321
parent70401e7ffa1beedf2639efe75089d6ad3c67626b
Merge remote-tracking branch 'origin/master'
build/scripts/layouts.gant
platform/util/resources/misc/registry.properties
resources/src/META-INF/IdeaPlugin.xml