Commits · f0dadf39c0b49180338477da35d426ec3c473f13 · SDK / KDiff3

25 Jan, 2012 1 commit

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 4 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

Translation updates · 0512b5cb

Joachim Eibl authored Aug 26, 2011

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

0512b5cb

Doc updates · 1c3a046d

Joachim Eibl authored Aug 26, 2011

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

1c3a046d

24 Aug, 2011 1 commit

Autodetect encoding now also recognises XML and HTML tags · fee8cc6e

Joachim Eibl authored Aug 24, 2011

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

fee8cc6e

15 Aug, 2011 1 commit

Translation update · b58fab73

Joachim Eibl authored Aug 15, 2011

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

b58fab73

04 May, 2011 3 commits

Old Mac LineEndStyle replaced with Unix LineEndStyle · dc138ef5

Joachim Eibl authored May 04, 2011

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

dc138ef5

Fix for bug #3296890 Trapped on Mac screen after simulated merge · fa41e9b3
Joachim Eibl authored May 04, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@122 c8aa9fed-2811-0410-8543-893ada326672
```
fa41e9b3

Improved StatusInfo in directory merge window · 46a8b230

Joachim Eibl authored May 04, 2011

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

46a8b230

02 May, 2011 3 commits

Delay getting creation and modification times until required · 55d73607
Joachim Eibl authored May 02, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@120 c8aa9fed-2811-0410-8543-893ada326672
```
55d73607

Fixed invalid character in comment · 2eea0d7b

Joachim Eibl authored May 02, 2011

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

2eea0d7b

Remove write protection on temp file from cleartool · 05980766

Joachim Eibl authored May 02, 2011

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

05980766

30 Apr, 2011 1 commit

Changes from KDE svn · d43c7992

Joachim Eibl authored Apr 30, 2011

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

d43c7992

29 Apr, 2011 1 commit

- parse preprocessor args and allow quoting via " or ' · 1412555e

Joachim Eibl authored Apr 29, 2011

- check for incomplete conversion to unicode (possible for utf8-codec)


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

1412555e

17 Apr, 2011 1 commit
- kdiff3fileitemactionplugin added (new contextmenu plugin for Dolphin and Konqueror) · b7f8391d
  Joachim Eibl authored Apr 17, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@115 c8aa9fed-2811-0410-8543-893ada326672
```
  b7f8391d
16 Apr, 2011 3 commits

Fixed some warnings · c83ccb37

Joachim Eibl authored Apr 16, 2011

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

c83ccb37

Use KProcess::startDetached instead of execute to avoid blocking · 409d6e17
Joachim Eibl authored Apr 16, 2011
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@113 c8aa9fed-2811-0410-8543-893ada326672
```
409d6e17

Use Qt4-lconvert instead of Qt3-msg2qm · 95ac4b64

Joachim Eibl authored Apr 16, 2011

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

95ac4b64