Commits · be2791369d9006b4e769b32bb12122a031b57d2a · SDK / Kompare

07 Apr, 2015 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · be279136

Script Kiddy authored Apr 07, 2015

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

be279136

23 Mar, 2015 1 commit
- Add .reviewboardrc file. · bf884018
  Jeremy Whiting authored Mar 23, 2015
  
  bf884018
15 Mar, 2015 1 commit

Fix VERSION and SOVERSION of private libraries. · 34e371e8

Kevin Kofler authored Mar 15, 2015

Don't use the obsolete GENERIC_LIB_VERSION and GENERIC_LIB_SOVERSION
macros that are not defined anymore. (CMake was interpreting the missing
strings as "SOVERSION" being the value of the VERSION property.)

BUG: 345148

34e371e8

04 Mar, 2015 1 commit
- Qt5PrintSupport is actually hard-required by komparepart. · 1c2d71b3
  Michael Palimaka authored Feb 22, 2015
```
REVIEW: 122671
```
  1c2d71b3
17 Nov, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 3b7f12cc
  Script Kiddy authored Nov 17, 2014
  
  3b7f12cc
16 Nov, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · c8f0ef06
  Script Kiddy authored Nov 16, 2014
  
  c8f0ef06
26 Oct, 2014 1 commit
- Use QUrl::toDisplayString() instead of toString(QUrl::RemovePassword) · f8e45fa1
  Kevin Kofler authored Oct 26, 2014
```
As recommended on kde-core-devel.

CCMAIL: jpwhiting@kde.org
```
  f8e45fa1
21 Oct, 2014 2 commits
- Remove one last klocale.h include. · c7de301c
  Jeremy Whiting authored Oct 21, 2014
```
REVIEW:120697
```
  c7de301c
- Remove other kdelibs4support headers · ca5bee09
  Jeremy Whiting authored Oct 20, 2014
```
REVIEW:120676
```
  ca5bee09
19 Oct, 2014 1 commit
- Remove kdemacros.h and use generate_export_header for interfaces folder. · 66957a77
  Jeremy Whiting authored Oct 18, 2014
```
REVIEW:120652
```
  66957a77
18 Oct, 2014 1 commit

Remove kdelibs4support. · 8e0c64e1

Jeremy Whiting authored Oct 17, 2014

Change KUrl to QUrl.
Use QLayout/QFrame instead of KVBox.
Use QFileDialog instead of KFileDialog.
Add utility method for generating QUrl from strings.
REVIEW:120627

8e0c64e1

17 Oct, 2014 1 commit

Initial port to frameworks. · b3f4727e

Jeremy Whiting authored Oct 10, 2014

It builds and runs, seems to compare files and folders ok.
Created logging categories for kompareshell, komparepart, and komparenavview
REVIEW:120554

b3f4727e

25 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 5d393577
  Script Kiddy authored Jul 25, 2014
  
  5d393577
24 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · f90fab9d
  Script Kiddy authored Jul 24, 2014
  
  f90fab9d
30 Jun, 2014 1 commit
- Fix compilation of Kompare · 339537ae
  Jeremy Whiting authored Jun 30, 2014
```
REVIEW: 119024
```
  339537ae
25 Dec, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 48943e13
  Script Kiddy authored Dec 25, 2013
  
  48943e13
10 Dec, 2013 1 commit
- Bump version to 4.1.3 for KDE 4.12. · 1fdf07d5
  Kevin Kofler authored Dec 10, 2013
```
The external libkomparediff2 is worth a new version number.
```
  1fdf07d5
17 Aug, 2013 1 commit
- cmake: use LIBKOMPAREDIFF2_LIBRARIES instead of komparediff2 · 3273abcd
  Pino Toscano authored Aug 17, 2013
  
  3273abcd
04 Aug, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 6faf391c
  Script Kiddy authored Aug 04, 2013
  
  6faf391c
25 Jul, 2013 1 commit
- Remove ../libdiff2 from komparepart include path, since it's gone. · c0251721
  Jeremy Whiting authored Jul 24, 2013
  
  c0251721
19 Jul, 2013 1 commit

Use external libkomparediff2. · 0977c04f

Jeremy Whiting authored Jul 19, 2013

Get actions from KompareModelList's actionCollection and add them to ours in KomparePart.

0977c04f

04 Jul, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 857f533f
  Script Kiddy authored Jul 04, 2013
  
  857f533f
10 May, 2013 1 commit
- fix endless loop · 7ca56c74
  Patrick Spendrin authored May 10, 2013
```
do not go into infinite loop in "save diff"

BUG:238297
```
  7ca56c74
03 May, 2013 1 commit
- Remove erroneous double-quotes around %c in Exec line · 08cd8fdb
  David Faure authored May 03, 2013
  
  08cd8fdb
14 Mar, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · e946db83
  Script Kiddy authored Mar 14, 2013
  
  e946db83
21 Feb, 2013 1 commit
- Remove extra space · 3a199fdf
  André Marcelo Alvarenga authored Feb 21, 2013
  
  3a199fdf
18 Feb, 2013 2 commits
- Merge remote-tracking branch 'origin/KDE/4.10' · 9a184368
  Albert Astals Cid authored Feb 18, 2013
  
  9a184368
- Add license for docs · feab4b9a
  Albert Astals Cid authored Feb 18, 2013
  
  feab4b9a
09 Feb, 2013 1 commit

Move documentation into application folders, make every application build... · 504187ef

Jeremy Whiting authored Dec 19, 2012

Move documentation into application folders, make every application build standalone or as part of kdesdk checkout

svn path=/trunk/KDE/kdesdk/kompare/; revision=1329172
(cherry picked from commit 1dfd4607)

504187ef

24 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 0271c44e
  Script Kiddy authored Dec 24, 2012
```
svn path=/branches/KDE/4.10/kdesdk/kompare/; revision=1329684
```
  0271c44e
23 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 323d3c3b
  Script Kiddy authored Dec 23, 2012
```
svn path=/branches/KDE/4.10/kdesdk/kompare/; revision=1329616
```
  323d3c3b
19 Dec, 2012 1 commit

Move documentation into application folders, make every application build... · 1dfd4607

Jeremy Whiting authored Dec 19, 2012

Move documentation into application folders, make every application build standalone or as part of kdesdk checkout

svn path=/trunk/KDE/kdesdk/kompare/; revision=1329172

1dfd4607

13 Oct, 2012 1 commit
- docs: add id attribute to <book> elements · bc159e9a
  Pino Toscano authored Oct 13, 2012
```
svn path=/trunk/KDE/kdesdk/doc/kompare/; revision=1320308
```
  bc159e9a
01 Sep, 2012 1 commit
- Add missing space · 925475b4
  André Marcelo Alvarenga authored Sep 01, 2012
```
svn path=/trunk/KDE/kdesdk/doc/kompare/; revision=1314407
```
  925475b4
24 Jul, 2012 1 commit
- Kompare: Bump version number to 4.1.2 for artaud's fix. · 6a0861f4
  Kevin Kofler authored Jul 24, 2012
```
svn path=/trunk/KDE/kdesdk/kompare/; revision=1307624
```
  6a0861f4
13 Jul, 2012 1 commit
- Make the kdesvn diff be loaded like a normal diff file. · 04efa9d5
  Jean-Nicolas Artaud authored Jul 13, 2012
```
BUG:137826

REVIEW:6988


svn path=/trunk/KDE/kdesdk/kompare/; revision=1305526
```
  04efa9d5
09 Feb, 2012 2 commits
- Kompare: Bump version to 4.1.1. Bump some copyright dates. · ab7453b6
  Kevin Kofler authored Feb 09, 2012
```
svn path=/trunk/KDE/kdesdk/kompare/; revision=1278832
```
  ab7453b6
- Kompare: Fix nonsensical tab expansion formula introduced by commit 1026032. · 5d8c7317
  Kevin Kofler authored Feb 09, 2012
```
BUG: 251025
FIXED-IN: 4.8.1

svn path=/trunk/KDE/kdesdk/kompare/; revision=1278831
```
  5d8c7317
29 Jan, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · eff97054
  Script Kiddy authored Jan 29, 2012
```
svn path=/trunk/KDE/kdesdk/kompare/; revision=1276451
```
  eff97054
20 Dec, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 4d1ecffd
  Script Kiddy authored Dec 20, 2011
```
svn path=/trunk/KDE/kdesdk/kompare/; revision=1269557
```
  4d1ecffd