Commits · b3f92d515f0ec1004ef7a0fe25f103633a2be883 · SDK / KDiff3

25 Jul, 2012 1 commit

Vista/Win7: Shell context menu now again displays text. · b3f92d51

Joachim Eibl authored Jul 25, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@170 c8aa9fed-2811-0410-8543-893ada326672

b3f92d51

18 Jul, 2012 1 commit
- configure script now understands options -d and -o and uses according names for the build directory · 4f8cba93
  Joachim Eibl authored Jul 18, 2012
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@169 c8aa9fed-2811-0410-8543-893ada326672
```
  4f8cba93
14 Jul, 2012 4 commits

Version 0.9.97 · dfd1560d

Joachim Eibl authored Jul 14, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@168 c8aa9fed-2811-0410-8543-893ada326672

dfd1560d

Version 0.9.97 · 52aabc97

Joachim Eibl authored Jul 14, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@167 c8aa9fed-2811-0410-8543-893ada326672

52aabc97

On KDE: Not creating a KDiff3Part anymore. · 82aa359d

Joachim Eibl authored Jul 14, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@166 c8aa9fed-2811-0410-8543-893ada326672

82aa359d

- Command line option --cs doesn't change the config value permanently anymore. · 3a4e8e37
Joachim Eibl authored Jul 14, 2012
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@165 c8aa9fed-2811-0410-8543-893ada326672
```
3a4e8e37

06 Jul, 2012 1 commit

Improvements for compilation on Windows · 5e55e1d3

Joachim Eibl authored Jul 06, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@164 c8aa9fed-2811-0410-8543-893ada326672

5e55e1d3

05 Jul, 2012 6 commits

Added new files (by Maurice van der Pot) · 9001116d

Joachim Eibl authored Jul 05, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@163 c8aa9fed-2811-0410-8543-893ada326672

9001116d

Added default directory anti patterns ".hg" and ".git" and file anti patterns... · eb8e5a73

Joachim Eibl authored Jul 05, 2012

Added default directory anti patterns ".hg" and ".git" and file anti patterns ".rej" and ".bak" for better mercurial and git integration.
(Idea by Angel Ezquerra)

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@162 c8aa9fed-2811-0410-8543-893ada326672

eb8e5a73

Find dialog: Select text (by Eike Sauer) · 36df9814

Joachim Eibl authored Jul 05, 2012

If text is selected in either input or output window use that text in find dialog.

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@161 c8aa9fed-2811-0410-8543-893ada326672

36df9814

By Maurice van der Pot: Regression test framework. · 277cf202

Joachim Eibl authored Jul 05, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@160 c8aa9fed-2811-0410-8543-893ada326672

277cf202

Improvements by Burkhard Lück · 0ef5fffc

Joachim Eibl authored Jul 05, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@159 c8aa9fed-2811-0410-8543-893ada326672

0ef5fffc

Destination path as optional second parameter, when first parameter is "local". · 66202e30
Joachim Eibl authored Jul 05, 2012
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@158 c8aa9fed-2811-0410-8543-893ada326672
```
66202e30

10 Apr, 2012 2 commits

Patch from Nigel Stewart: Fix for git on Cygwin · 1536a29c

Joachim Eibl authored Apr 10, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@157 c8aa9fed-2811-0410-8543-893ada326672

1536a29c

Patch for Ubuntu by Scott Corley · 7d907c64

Joachim Eibl authored Apr 10, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@156 c8aa9fed-2811-0410-8543-893ada326672

7d907c64

08 Apr, 2012 1 commit

Fix crash when changing the m_statusText · a6f5a288

Joachim Eibl authored Apr 08, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@155 c8aa9fed-2811-0410-8543-893ada326672

a6f5a288

25 Jan, 2012 1 commit

Fixed reading clearcase file · f0dadf39

Joachim Eibl authored Jan 25, 2012

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@154 c8aa9fed-2811-0410-8543-893ada326672

f0dadf39

27 Oct, 2011 1 commit

Improved caption for clearcase paths · 614cfcaf

Joachim Eibl authored Oct 27, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@153 c8aa9fed-2811-0410-8543-893ada326672

614cfcaf

25 Sep, 2011 1 commit
- - Optimized memory usage in DirectoryMergeWindow and FileAccess. · 59d3e2f8
  Joachim Eibl authored Sep 25, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@151 c8aa9fed-2811-0410-8543-893ada326672
```
  59d3e2f8
23 Sep, 2011 1 commit

Include added. (Needed on some machines.) · 7db7b499

Joachim Eibl authored Sep 23, 2011


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@150 c8aa9fed-2811-0410-8543-893ada326672

7db7b499

22 Sep, 2011 1 commit

Always stay up to date with history from registry · d57f3d38

Joachim Eibl authored Sep 22, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@149 c8aa9fed-2811-0410-8543-893ada326672

d57f3d38

15 Sep, 2011 1 commit

Patches by David Wilhelm: · 1de3cc79

Joachim Eibl authored Sep 15, 2011

These patches add two new directory diff settings, useful when running kdiff3 from a VCS [1]:
1. Unfold all subdirectories on startup, matching the "Expand subfolders when loading session" setting in Beyond Compare.
2. Skip the Directory Comparison Status report.

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@148 c8aa9fed-2811-0410-8543-893ada326672

1de3cc79

14 Sep, 2011 4 commits
- Fix for tab-key moving focus instead of adding a tab character in MergeResultWindow. · 2a1f5639
  Joachim Eibl authored Sep 14, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@147 c8aa9fed-2811-0410-8543-893ada326672
```
  2a1f5639
- Fixed mouse wheel problem. (Patch by David Hay) · 72ed2c72
  Joachim Eibl authored Sep 14, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@146 c8aa9fed-2811-0410-8543-893ada326672
```
  72ed2c72
- From Alexey Kostromin: Change an encoding in diff text window via click on encoding label. · c325dba8
  Joachim Eibl authored Sep 14, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@145 c8aa9fed-2811-0410-8543-893ada326672
```
  c325dba8
- Also support folders for context menu · c91a0915
  Joachim Eibl authored Sep 14, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@144 c8aa9fed-2811-0410-8543-893ada326672
```
  c91a0915
07 Sep, 2011 2 commits

- When word wrap is active toggling line numbers now recalculates the word wrap. · 09312071

Joachim Eibl authored Sep 07, 2011

- Removed confusing "For compatibility ..." hint from option -qall


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@143 c8aa9fed-2811-0410-8543-893ada326672

09312071

- On Windows use config file .kdiff3rc next to kdiff3.exe if exists. · a1c9a475

Joachim Eibl authored Sep 07, 2011

- In overwiev for two way diff show if only one side contains text.


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@142 c8aa9fed-2811-0410-8543-893ada326672

a1c9a475

03 Sep, 2011 4 commits

Fix for fedora (by Neal Becker) · a9a36fb9

Joachim Eibl authored Sep 03, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@141 c8aa9fed-2811-0410-8543-893ada326672

a9a36fb9

"ca@valencia" · 60820f79

Joachim Eibl authored Sep 03, 2011


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@140 c8aa9fed-2811-0410-8543-893ada326672

60820f79

sed and gnudiff utilities added to package · ef1a1ca7

Joachim Eibl authored Sep 03, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@139 c8aa9fed-2811-0410-8543-893ada326672

ef1a1ca7

util subdir renamed to bin · d82aa71e

Joachim Eibl authored Sep 03, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@138 c8aa9fed-2811-0410-8543-893ada326672

d82aa71e

02 Sep, 2011 2 commits
- For WIN32 if the preprocessor command is sed, try to use the installed sed.exe · 82e6c3b3
  Joachim Eibl authored Sep 02, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@137 c8aa9fed-2811-0410-8543-893ada326672
```
  82e6c3b3
- For WIN32 if the preprocessor command is sed, try to use the installed sed.exe · 65532a00
  Joachim Eibl authored Sep 02, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@136 c8aa9fed-2811-0410-8543-893ada326672
```
  65532a00
01 Sep, 2011 1 commit

Updates from KDE-repository · 90040e16

Joachim Eibl authored Sep 01, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@135 c8aa9fed-2811-0410-8543-893ada326672

90040e16

30 Aug, 2011 2 commits

New languages, subdir buildTools · a56e4acc

Joachim Eibl authored Aug 30, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@134 c8aa9fed-2811-0410-8543-893ada326672

a56e4acc

Renamed ca@valencia · 4968129c

Joachim Eibl authored Aug 30, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@133 c8aa9fed-2811-0410-8543-893ada326672

4968129c

28 Aug, 2011 1 commit

Fixed compile problems for win-64 bit version · eac40c92

Joachim Eibl authored Aug 28, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@132 c8aa9fed-2811-0410-8543-893ada326672

eac40c92

26 Aug, 2011 2 commits

· 743c388f

Joachim Eibl authored Aug 26, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@131 c8aa9fed-2811-0410-8543-893ada326672

743c388f

Fix compile warning · 002b3c8a

Joachim Eibl authored Aug 26, 2011

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@130 c8aa9fed-2811-0410-8543-893ada326672

002b3c8a