Merge branch 'diff' idea/134.1156
authorAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
committerAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
commit005ff90b909fe418df63cfe2e0661fa2ba3f0789
treeb7ccb1e3665eba786444d89e8b39721c57c8bb68
parent7ebaa92ac3bcde92e315827bd8baa767fd3acd48
parente3b3064284511b3cdb9f5a5df629fe03ce9e648b
Merge branch 'diff'
platform/platform-resources-en/src/misc/registry.properties