EA-37573 NPE
[idea/community.git] / platform / platform-impl / src / com / intellij / openapi / diff / impl / incrementalMerge / ui / MergePanel2.java
2012-08-11 Kirill LikhodedovEA-37573 NPE
2012-07-30 Maxim.MossienkoMerge remote-tracking branch 'origin/master' idea/120.274
2012-07-25 Evgeny PasynkovMerge branch 'master' into upsource-master
2012-07-23 irengrigMerge remote branch 'origin/master'
2012-07-22 Kirill Likhodedov[diff/merge] IDEA-59513 scroll to the first conflicting...
2012-07-22 Kirill Likhodedov[merge tool] fix a misprint in the method name
2012-07-22 Kirill Likhodedov[merge tool] cleanup, @Nullable, dead code
2012-07-17 Kirill LikhodedovMerge remote-tracking branch 'origin/master' idea/120.152
2012-07-17 Kirill LikhodedovMerge remote-tracking branch 'origin/master'
2012-07-17 Kirill LikhodedovMerge branch 'merge_tool_dividers'
2012-07-16 Kirill Likhodedov[merge tool] Better gutter markers, solve EditorPlace...
2012-07-09 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2012-07-09 irengrigMerge remote branch 'origin/master'
2012-07-09 Ekaterina TuzovaMerge remote-tracking branch 'origin/master'
2012-07-07 Kirill Likhodedov[merge tool] Fix conflict counter (displayed at the...
2012-07-07 Kirill Likhodedov[merge tool] Make diff markers flow above gutters and...
2012-06-28 Kirill Likhodedov[merge tool] return the line markers area (with apply...
2012-06-27 Kirill Likhodedov[merge tool] fix setting the EditorColorsScheme on...
2012-06-27 Kirill Likhodedov[merge tool] Don't show the default gutter popup.
2012-06-27 Kirill Likhodedov[merge tool] Make possible to hide/show line numbers...
2012-06-06 Evgeny PasynkovMerge branch 'master' into upsource-master
2012-06-04 Maxim.MossienkoMerge remote-tracking branch 'origin/master'
2012-06-04 Alexander LobasMerge remote-tracking branch 'origin/master'
2012-06-04 irengrigMerge remote branch 'origin/master'
2012-06-04 Kirill LikhodedovMerge remote-tracking branch 'origin/master'
2012-06-04 Kirill LikhodedovMerge branch 'merge_tool_improving'
2012-06-02 Kirill Likhodedov[merge] Display applied changes; allow applying both...
2012-05-31 Evgeny PasynkovMerge branch 'master' into upsource-master
2012-05-30 irengrigMerge remote branch 'origin/master'
2012-05-30 Maxim ShafirovUnified access to icons.jar resources
2012-05-24 Shaverdova ElenaMerge branch 'ts'
2012-04-19 Maxim.MossienkoMerge remote-tracking branch 'origin/master'
2012-04-19 Roman ShevchenkoTypos
2012-03-02 Dmitry JemerovMerge remote-tracking branch 'origin/master'
2012-03-02 Alexander LobasMerge remote-tracking branch 'origin/master'
2012-03-02 Kirill LikhodedovMerge remote-tracking branch 'origin/master'
2012-03-02 irengrigMerge remote branch 'origin/master'
2012-03-02 irengrigshow diff: reuse composite panel for normal diff as...
2012-02-15 Dmitry JemerovMerge remote-tracking branch 'origin/master'
2012-02-15 Maxim.MossienkoMerge remote-tracking branch 'origin/master'
2012-02-15 irengrigMerge remote branch 'origin/master'
2012-02-15 irengrigMerge remote branch 'origin/master'
2012-02-15 irengrigSVN 1.7: show properties diff in common chain
2011-10-12 nikMerge /home/nik/work/jpsImport/JPS
2011-06-23 Eugene KudelevskyMerge commit 'origin/master'
2011-06-23 annaredundant casts: cleanup
2011-06-07 Maxim MossienkoMerge remote branch 'origin/master'
2011-06-05 Dmitry JemerovMerge branch 'psicore' pycharm/108.400
2011-06-02 peterMerge branch 'master' into move
2011-06-01 Kirill KalishevMerge branch 'master' of git@git.labs.intellij.net...
2011-06-01 irengrigMerge remote branch 'origin/master'
2011-06-01 irengrigVCS: diff for big files - throw exception if algorithm...
2010-04-14 Maxim MedvedevMerge branch 'master' into changeSignature
2010-04-06 sweinreuterMerge branch 'master' of git.labs.intellij.net:idea...
2010-04-05 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2010-04-05 Alexey Kudravtsevfinal fields
2010-01-18 Dmitry Jemerovmerge idea90 branch into trunk
2010-01-14 irengrigMerge branch 'master' of git.labs.intellij.net:idea...
2010-01-12 Maxim.MossienkoMerge branch 'master' of git.labs.intellij.net:idea...
2009-12-29 Dmitry AvdeevMerge branch 'master' of git.labs.intellij.net:idea...
2009-12-28 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2009-12-28 Dmitry Jemerovavoid using deprecated constants from DataConstants... 94.66
2009-11-10 Kirill KalishevMerge branch 'tree-ui'
2009-11-07 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2009-11-06 nikMerge branch 'master' of git@git.labs.intellij.net...
2009-11-06 irengrigMerge branch 'master' of git.labs.intellij.net:idea...
2009-11-06 irengrigapply patch: show diff with conflicts
2009-10-12 Kirill KalishevMerge branch 'tree-ui'
2009-10-12 Maxim MedvedevMerge branch 'master' of git.labs.intellij.net:idea...
2009-10-11 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2009-10-11 Dmitry Jemerovupdate copyrights; use project-level instead of module...
2009-09-28 Constantine PlotnikovMerged SVN plugins IMPORTED
2009-08-28 Dmitry Jemerovplatform-impl moves