Merge branch 'tool-window-content'
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 2 Nov 2009 10:41:02 +0000 (13:41 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 2 Nov 2009 10:41:02 +0000 (13:41 +0300)
1  2 
platform/platform-resources/src/idea/DefaultKeymap.xml
platform/platform-resources/src/idea/PlatformActions.xml