Mercurial > hg > easyhg-kdiff3
annotate kdiff3/src-QT4/kreplacements/kparts/factory.h @ 105:2df4daf33fbd easyhg_kdiff3_simplifications
Some simplifications under SIMPLIFIED_KDIFF3 ifdef.
* Remove progress dialog on startup
* Remove Merge menu, Directory menu's merge functions, and merge columns if only two files/directories provided
| author | Chris Cannam |
|---|---|
| date | Wed, 13 Apr 2011 17:05:13 +0100 |
| parents | 08ea9b86c12c |
| children |
| rev | line source |
|---|---|
| joachim99@8 | 1 #include "kreplacements.h" |
| joachim99@8 | 2 |