Commits · 4968129cb726a59d5cb85b85bba6cdb2a591a07a · SDK / KDiff3

30 Aug, 2011 1 commit

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

New translation · 7ceccfff

Joachim Eibl authored Apr 16, 2011

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

7ceccfff

Fixed documentation for KDE4.5 and newer · ee7a5d9e

Joachim Eibl authored Apr 16, 2011

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

ee7a5d9e

Fixed white space merge default options · d61f445b

Joachim Eibl authored Apr 16, 2011

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

d61f445b

28 Nov, 2010 1 commit

Separate deltas if only one is of type where B==C · f8cbe7d6

Joachim Eibl authored Nov 28, 2010

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

f8cbe7d6

02 Sep, 2010 1 commit
- Corrected handling of unicode arguments, especially filenames · 5ce2ab13
  Joachim Eibl authored Sep 02, 2010
```
git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@106 c8aa9fed-2811-0410-8543-893ada326672
```
  5ce2ab13
31 Jul, 2010 1 commit

Corrections for file sizes >2GB · 8867372d

Joachim Eibl authored Jul 31, 2010

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

8867372d

04 Jul, 2010 1 commit

Corrected reading and writing Utf8 with BOM · 46c72a86

Joachim Eibl authored Jul 04, 2010

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

46c72a86

17 May, 2010 1 commit

Fixed compilation for windows. · e465595d

Joachim Eibl authored May 17, 2010

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

e465595d

15 May, 2010 1 commit

- Fixed redundant empty line in history merge. · d1ccf55c

Joachim Eibl authored May 15, 2010

- Fixed inconsistency in directory view info area after scan.
- Fixed crash if trying to disable "Dir & Text Split Screen View" and no
  file is loaded.
- Fixed test dialog for regular expressions.



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

d1ccf55c

28 Mar, 2010 1 commit

- Fixed typo. · fd815b05

Joachim Eibl authored Mar 28, 2010

- Applied patch for installation of kdiff3_part.rc (Sourceforge id
  2978067)


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

fd815b05

25 Mar, 2010 1 commit

Fixed problem where destination directory would be renamed or deleted · 6e16eee0

Joachim Eibl authored Mar 25, 2010

during copy operation. Now if the destination directory exists only the
files inside will be copied.

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

6e16eee0

28 Feb, 2010 3 commits

- OS2-port by Silvan Scherrer · 11dbd4d9

Joachim Eibl authored Feb 28, 2010

- Fixed writing to KIO.
- Fix crash on A/B-overview (infinite recursion)


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

11dbd4d9

64 bit support for diff_ext_for_kdiff3 and installer · b17d053d

Joachim Eibl authored Feb 28, 2010


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

b17d053d

File create_qm_files added · d21242f2

Joachim Eibl authored Feb 28, 2010


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

d21242f2

03 Mar, 2009 1 commit

KDiff3 0.9.95 · c7a55126

Joachim Eibl authored Mar 03, 2009


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

c7a55126

06 Jan, 2009 5 commits

Fix crash on start if word wrap is on, and fix for storing utf-8 without · 98456f04
Joachim Eibl authored Jan 06, 2009
```
BOM.


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

· c1c1fd4b

Joachim Eibl authored Jan 06, 2009

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

c1c1fd4b

· dc4e200b

Joachim Eibl authored Jan 06, 2009

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

dc4e200b

· 33509aac

Joachim Eibl authored Jan 06, 2009

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

33509aac

· e936cbdb

Joachim Eibl authored Jan 06, 2009

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

e936cbdb