Merge branch 'master' into kirillk/dc
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 28 Oct 2010 11:08:18 +0000 (15:08 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 28 Oct 2010 11:08:18 +0000 (15:08 +0400)
commit11d32995d2e0e3e6508a22113313ea81c14a319d
tree7c13d2fdc0946ee9d3458934ce2174a954075980
parenta96f9bbe81c5b1fa75b6713a86df2c3379d7a38c
parentf610afff71a0a2fd6e6f71f5420940d74ead5a11
Merge branch 'master' into kirillk/dc
platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
platform/platform-resources-en/src/misc/registry.properties