Merge branch 'master' into multiroot_branch
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)
1  2 
platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java