Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 16 Sep 2010 08:57:15 +0000 (12:57 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 16 Sep 2010 08:57:15 +0000 (12:57 +0400)
commit2dff4ccd4d4b43dcbf032c01d42159443ee3fd56
treefbf412c94f9a5dc580a1852592caca2fe960b1e0
parent763fc2ae2c9f1cd3d8975afab30547dc12b34f0f
parent6f914ea733a5cd8c1d7eca0cbe9d2d7a56b2ab2f
Merge branch 'master' of git.labs.intellij.net:idea/community

Conflicts:
java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java