author | Kirill Likhodedov <Kirill.Likhodedov@gmail.com> | |
Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300) | ||
committer | Kirill Likhodedov <Kirill.Likhodedov@gmail.com> | |
Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300) | ||
commit | 14ace34aa29500013f969cfc27b4aaaeaeb4abfa | |
tree | f07905ca6870252b69ce60b75f7d6a22ffa0892f | tree |
parent | 5e0e59381e3c27049800fe1d6c85db1a9fa56d26 | commit | diff |
parent | 6fd765f3c978d3ed9573403cfbbd798d9d423682 | commit | diff |
platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java | diff1 | | diff2 | | blob | history |
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java | diff1 | | diff2 | | blob | history |