Merge branch 'master' into kirillk/dc
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 20 Oct 2010 12:25:41 +0000 (16:25 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 20 Oct 2010 12:25:41 +0000 (16:25 +0400)
commit36ac21903a4bd07c9687020f172f25576adc0628
tree0d0414e8622531b9cbfaaa0508925e99c3d004b8
parent799a24192c237eea032d662725a76e40c2142cac
parent96043c3e1ef439e9b65ec349661b66b01e9facca
Merge branch 'master' into kirillk/dc
platform/platform-resources/src/componentSets/Platform.xml