Commit 235d1530 authored by Joachim Eibl's avatar Joachim Eibl

Not needed in KDiff3 0.9.70


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@15 c8aa9fed-2811-0410-8543-893ada326672
parent 2d460242
......@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -278,63 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
Version 0.81 - 2002/08/18
Version 0.9.70 - 2003/09/28
===========================
- Transparent access to URLs via KIO (KDE only):
Compare files and directories on ftp, fish, smb, tar etc. ressources.
- Workaround for a Win32-bug (Crashed sometimes during selections)
- When the merge flag is selected in the open dialog, the directory-tool
always starts a merge by default for each file. Without the flag only a
diff will be started by default.
- Immediately showing progress bar in dir scan.
- Showing progress bar for file comparison too.
- Directory-menu: Fold/Unfold all subdirs
- Bugfix for 3-way auto-merge: A line deleted from the base in B and C
resulted in a empty line instead of being completely removed.
- Improved locale support
- KDiff3 is now a KPart
- in KDevelop3 it can be used to compare the current text with the
last saved version, or the current version on disk with the last cvs version.
- in Konqueror it can be used to look at a unified *.patch-file if one complete
version is available too.
- Documentation is now in docbook-format.
- "Toggle Split Orientation" for Diff-Input windows. (Good for long lines.)
- When "Dir and Text Split-Screen-View" is off: Now "Focus Next/Prev Window"
also toggles between dir and text-windows. Selecting a file via double click
switches to text-screen.
- KDiff3 displays a warning when trying to read a dir without the permission.
- Directory-Diff-Option "Use CVS-Ignore" to ignore files like CVS does.
- Displaying a status message at the end of the directory-comparison.
- Cursor in MergeResultWindow is automatically placed at current difference when a jump occurred.
(But not when something was selected.)
- Fix for cursor blinking in the topline of the MergeResultWindow.
Version 0.9.61 - 2003/06/07
===========================
- Compilation problem fixed.
- Directory merge: Preserving file attributes and times during copy. (now also for Win32)
- Crash fixed, when directory comparison from the command-line was started.
Version 0.9.60 - 2003/06/01
===========================
New features:
- New ways to select input for the diff window:
- Pasting clipboard text into a diff window.
- Drag and drop a file from a filemanager (e.g. konqueror) onto a diff window.
- Drag and drop text from an editor (e.g. kate) onto a diff window.
Reanalysis starts immediately if no merge is in progress.
(This should help you to compare similar parts in the same file.)
- New/Deleted white lines are now also considered as white deltas.
- Configurable keyboard shortcuts for most actions (KDE version only).
- The overview now also distinguishes whitespace deltas.
New preprocessor options:
- You can now define your own external Preprocessor and LineMatchingPreprocessor:
- "Convert to upper case",
- "Ignore numbers"
Fixed bugs:
- Directory merge: Preserving file attributes and times during copy.
(not for Win32 yet)
Source-tree-structure:
- Switch to KDevelop3 (Gideon): Renamed subdir "kdiff3" to "src".
- xpm-files in xpm-subdirectory.
Version 0.9.51 - 2003/04/14
===========================
- Compilation fix for gcc 2.95.
Version 0.9.50 - 2003/03/30
===========================
Fixed bugs:
- Auto-Advance setting was lost when entering the settings-dialog.
- Windows specific: Keys with AltGr-Combination didn't work.
- Windows 95/98/ME: Fixed crash when KDiff3 is called used without parameters,
and corrected support for external diff.
New Features:
- Search-function: Search for a string in all open text windows.
- Special background colors for current region.
- Button to toggle showing of whitespace in differences.
- Buttons to go to next/prev unsolved (!) conflict.
- While auto-advance waits, no more choices are allowed.
- New setting: Auto-advance-delay.
(Note that with delay 0 fast clicks might be detected as double clicks and the second
click does nothing. My advice: Prefer the keyboard-shortcuts Ctrl-1/2/3)
- Functions to Show/Hide Diff Window A, B or C. The other windows then have more space.
- Merge editor: The right mouse button selects the current region and lets you choose
A, B or C via a popup menu.
- Commandline option --auto: No GUI if all conflicts are auto-solvable.
- When equal files are compared, then a message box informs you.
- Merge current file: When comparing two or three files, the merge can be started with a single click.
- Option dialog: Warning for "Defaults" added, because it resets all options.
- A warning is given, when the user tries to merge binary files. (i.e. files that contain '\0'-bytes)
Changed behaviour:
- 3 file automerge: When for a line B==C (and A!=B) then C will be selected.
(In older versions this was a conflict. I was convinced that this is no problem.)
- Auto-Advance now jumps to next unsolved (!) conflict.
- On 256-color-displays KDiff3 uses them. (Previously KDiff3 only used 16 colors.)
- On 16-color-displays the Defaults-button in the options dialog selects special colors.
Version 0.941 - 2003/02/09
==========================
Fixed bugs:
- Qt-only-version: Compile problem corrected.
- Documentation: Formatting for tables corrected.
Version 0.94 - 2003/02/09
=========================
New features:
- Option to use external GNU-diff for line matching.
(Sometimes GNU-diff is better, sometimes not: You may choose now.)
- In diff-windows a tooltip shows the full path if you move the mouse on the filename.
- Speedup of directory-merge operations without user interaction.
(Not every item in the tree is made visible anymore. This took too long.)
- When opening a file for comparison or merge KDiff3 immediately shows the first difference.
- "Go To Top/Bottom"-action have been changed to "Go To First/Last Delta".
- Font-Option "Italic For Deltas" added.
- Many icons and actions will only be enabled, when the operation is possible.
- Icon for merge of current file in directory merge mode added.
- New action "Go to Current Delta".
- Conflicts where some lines contained only-white-space-changes are now separated from
other non-white-space-conflicts.
- Experimental: Use as replacement for ClearCase-cleardiffmrg.exe (under Windows only).
See main.cpp for details.
Fixed bugs:
- If files were different, but had the same dates, the "not existant"-icon was
shown for one file. Now a error message will be shown if the option
"Copy newer instead of merging" is used.
- Documentation: Section "The Operation Column" corrected.
- Qt-only-version: Fontsize wasn't correctly restored.
- Keyboard accelerators didn't work for ToggleActions.
Version 0.931 - 2003/01/19
==========================
Fix for compilation problems with gcc version < 3.
Version 0.93 - 2003/01/16
=========================
New features:
- Directory comparison and merge. (More than 3000 new lines of code only here!!!)
- Open-Dialog: Filename specification: If no previous filename is there then start
directory is taken from another file.
- Message about number of found and automatically solved conflicts.
- Support for wheelmouse based scrolling.
- New option in Diff-tab: Preserve Carriage Return Characters
Fixed bugs:
- Save button disabled until all conflicts are solved.
- Copy-operation conserves conflict messages "<Merge Conflict>".
- Paste operation created pseudo conflicts when the clipboard contained empty lines.
- W95/98/ME specific program crash removed.
Version 0.92 - 2002/11/04
=========================
Severe bug corrected:
- Merge menu: Choose A/B/C Everywhere sometimes lost data. (introduced in 0.9)
Version 0.91 - 2002/11/03
=========================
Speed improvements for very big/complicated files:
- Faster analysis because of limited search range (can be adjusted).
- Faster scrolling and editor behaviour.
Fixed bugs:
- Compilation problem with gcc 3.2 fixed.
- When comparing two lines, matching spaces often were undetected.
- Merge editor appended extra empty line when saving.
- Sometimes the next diff/conflict wasn't made visible.
- The Auto-Advance setting is saved now.
- When doing a merge the application now has modified-state,
even without further input. (The old method wasn't safe.)
- File selection now always in directory of respective file.
Version 0.9 - 2002/10/16
========================
New features:
- Qt-only support. Allows compilation under KDE2, Gnome, Mac, Windows, ...
Note that KDE3 still gets special treatment.
- For Mergers: Auto-Advance after selection, Choose A/B/C everwhere, ...
- Commandline: If files with same name in different directories
are compared, only the first parameter needs the filename.
- Shift-Del, Ctrl-Ins, Shift-Ins supported for Cut/Copy/Paste
Fixed bugs:
- Make failed on some systems because of missing "minmax.h".
- Files where opened for reading, but not closed afterwards.
- Vertical scrollbar sometimes didn't work correctly.
Version 0.81 - 2002/08/18
=========================
New features:
- Now KDE3 is also supported. Previously only KDE2 was supported.
- Navigation via click into the overview column now supported.
......@@ -15,5 +212,3 @@ Fixed bugs:
Version 0.8 - 2002/07/28
========================
This is the first version to be released.
It has all features intended for version 1.0 but so far has only been
tested by the original author.
####### kdevelop will overwrite this part!!! (begin)##########
SUBDIRS = kdiff3 po doc
EXTRA_DIST = kdiff3.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README kdiff3.lsm
####### kdevelop will overwrite this part!!! (end)############
# not a GNU package. You can remove this line, if
# have all needed files, that a GNU package needs
AUTOMAKE_OPTIONS = foreign
SUBDIRS = $(TOPSUBDIRS)
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
......@@ -24,6 +15,8 @@ package-messages:
$(MAKE) -f admin/Makefile.common package-messages
$(MAKE) -C po merge
EXTRA_DIST = admin COPYING configure.in.in
dist-hook:
cd $(top_distdir) && perl admin/am_edit -padmin
cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
all:
@echo "This Makefile is only for the CVS repository"
@echo "This will be deleted before making the distribution"
@echo ""
@if test ! -d admin; then \
echo "Please recheckout this module!" ;\
echo "for cvs: use checkout once and after that update again" ;\
echo "for cvsup: checkout kde-common from cvsup and" ;\
echo " link kde-common/admin to ./admin" ;\
exit 1 ;\
fi
$(MAKE) -f admin/Makefile.common cvs
.SILENT:
......@@ -2,8 +2,8 @@ KDiff3-Readme
=============
Author: Joachim Eibl (joachim.eibl@gmx.de)
Copyright: (C) 2002 by Joachim Eibl
KDiff3-Version: 0.81
Copyright: (C) 2002-2003 by Joachim Eibl
KDiff3-Version: 0.9.70
KDiff3 is a program that
......@@ -11,7 +11,8 @@ KDiff3 is a program that
- shows the differences line by line and character by character (!),
- provides an automatic merge-facility and
- an integrated editor for comfortable solving of merge-conflicts
- and has an intuitive graphical user interface.
- and has an intuitive graphical user interface,
- and allows directory comparison and merge.
Licence:
......@@ -32,49 +33,98 @@ Licence:
For details see file "COPYING".
Exception from the GPL:
As a special exception, the copyright holder Joachim Eibl gives permission
to link this program with the Qt-library (commercial or non-commercial edition)
from Trolltech (www.trolltech.com), and he permits to distribute the resulting
executable, without including the source code for the Qt-library in the
source distribution.
Requirements & Installation:
Version 0.81 supports KDE2 and KDE3 but due to some problem with libkio and libkfile
it was necessary to provide different packages for each, but only the configure
script differs.
For KDE2 you need
- kdiff3-0.81_for_KDE2.tar.gz
- KDE2 and QT2-libraries.
- gcc, g++ with version >=2.95
For KDE3 you need
- kdiff3-0.81_for_KDE3.tar.gz
- KDE3 and QT3-libraries.
- gcc, g++ with version >=2.95
Installation for KDE2:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt2)
- Unpack the archive: tar xvfz kdiff3-0.81_for_KDE2.tar.gz
- cd into the directory kdiff3-0.81 and type
- ./configure --prefix=/opt/kde2
- make
- make install (You must have root-rights for this step.)
Version 0.9.70 provides special support for KDE3, but it can also be
built without KDE3 if the Qt-libraries are available.
(I also tested the program under Windows.)
You always need
- kdiff3-0.9.70.tar.gz
For building the KDE3-version
- KDE>=3.1 and QT>=3.1-libraries.
- gcc, g++ with version >=3.2
For building the Qt-only-version
- QT-libraries (version 2.3.0 or >=3.1.0).
(www.trolltech.com)
- for Un*x: gcc, g++ with version >=3.2
- for Windows: VC6
Installation for KDE3:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
- Unpack the archive: tar xvfz kdiff3-0.81_for_KDE3.tar.gz
- cd into the directory kdiff3-0.81 and type
- ./configure --prefix=/opt/kde3
- make
- make install (You must have root-rights for this step.)
- cd into the directory kdiff3-0.9.70 and type
- ./configure --prefix=/opt/kde3 (your KDE3 directory here)
- (make clean) (Required if you already compiled once.)
- make (Run compilation)
- make install (You must have root-rights for this step.)
For details also see the generic instructions in file "INSTALL".
If some icons are not visible or don't seem right, probably the prefix
was wrong. Check where you're KDE2/3 installation is located and
use that directory with the prefix-option of configure.
If some icons are not visible or don't seem right, probably the prefix
was wrong. Check where your KDE3 installation is located and
use that directory with the prefix-option of configure.
For SuSE and most distributions the prefix usually is /opt/kde3.
For Redhat and Mandrake the prefix usually is /usr.
For a local installation, that doesn't need root rights try
- ./configure --prefix=$KDEHOME ($KDEHOME probably is the same as $HOME/.kde)
- make
- make install (Installs everything in $KDEHOME. No root rights required.)
- Run $KDEHOME/bin/kdiff3. ($KDEHOME/bin is probably not in your path.)
Warning: If a local installation and a global installation exist, the local
menu, toolbar, help etc. will be used, even if you start the global
executable. To avoid confusion, better remove the local version then.
(rm -R `find $KDEHOME -name "*kdiff3*" -not -name "kdiff3*rc"`)
Installation for the Qt-only-platforms for Un*x:
(for Qt >=3.1.0)
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
- cd into the directory kdiff3-0.9.70/src and type
- make -f Makefile.qt
- make -f Makefile.qt install (You must have root-rights for this step.)
(copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
- Note: The file kdiff3.pro was used to generate the Makefile.qt:
qmake kdiff3.pro -o Makefile.qt
Build for Windows:
(Qt 2.3-non commercial)
- Start some console.
- Make sure your shell-variable QTDIR is correct. (echo %QTDIR%).
If it doesn't contain the correct path, type
set QTDIR=your_path_to_qt (e.g. c:\qt)
- Make sure your VC6 environment variables are set. Run VCVARS32.BAT.
(Typically located in "c:\programs\Microsoft Visual Studio\VC98\bin")
- cd into the directory kdiff3-0.9.70\src and type
- nmake /f Makefile.win_qt230
- For execution the Qt-DLL must be in the path or in the same directory.
For newer versions of Qt, use qmake and kdiff3.pro to generate
an appropriate Makefile.
qmake kdiff3.pro -o Makefile
Build for Mac:
- I couldn't test this, so you might have to experiment a bit.
- Start by generating a Makefile with
- qmake kdiff3.pro -o Makefile
- If you succeed, I'd like to know how so I can document it here.
Start from commandline:
- Comparing 2 files: kdiff3 file1 file2
- Merging 2 files: kdiff3 file1 file2 -o outputfile
......@@ -82,6 +132,11 @@ Start from commandline:
- Merging 3 files: kdiff3 file1 file2 file3 -o outputfile
Note that file1 will be treated as base of file2 and file3.
If all files have the same name but are in different directories, you can
reduce typework by specifying the filename only for the first file. E.g.:
- Comparing 3 files: kdiff3 dir1/filename dir2 dir3
(This also works in the open-dialog.)
If you start without arguments, then a dialog will appear where you can
select your files via a filebrowser.
......
#MIN_CONFIG(3)
#MIN_CONFIG(3.0.0)
AM_INIT_AUTOMAKE(kdiff3,0.81)
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
dnl KDE_NEED_FLEX dnl __kdevelop__
dnl AC_PROG_YACC dnl __kdevelop__
AM_INIT_AUTOMAKE(kdiff3, 0.9.70)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
[AUTHORS]
dist=true
install=false
install_location=
type=DATA
[COPYING]
dist=true
install=false
install_location=
type=DATA
[ChangeLog]
dist=true
install=false
install_location=
type=DATA
[Config for BinMakefileAm]
addcxxflags=
bin_program=kdiff3
cflags=
cppflags=
cxxflags=\s-O0 -g3 -Wall
ldadd=\s$(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
ldflags=\s \s
[General]
AMChanged=true
author=Joachim Eibl
configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s
debug_args=test/0.c test/1.c test/2.c -m
email=joachim.eibl@gmx.de
kdevprj_version=1.3
lfv_open_groups=Benutzerschnittstelle,Header,Quellen
make_options=\s-j1
makefiles=Makefile.am,kdiff3/Makefile.am,doc/Makefile.am,doc/en/Makefile.am,po/Makefile.am
modifyMakefiles=true
project_name=KDiff3
project_type=normal_kde2
sgml_file=/home/joachim/kdiff3/doc/en/index.docbook
short_info=KDiff3 compares two or three ,input files\\, shows the differences,line by line and character by character (!)\\,,provides an automatic merge-facility,and an editor for comfortable solving ,of merge-conflicts\\, and has an ,intuitive graphical user interface.
sub_dir=kdiff3/
version=0.81
version_control=None
workspace=1
[INSTALL]
dist=true
install=false
install_location=
type=DATA
[KPP]
kpp_appgrp=
kpp_bldroot=
kpp_icon=0
kpp_license=5
kpp_summary=
kpp_url=http://kdiff3.sourceforge.net
kpp_version=0.8
[LFV Groups]
Andere=*
Benutzerschnittstelle=*.kdevdlg,*.ui,*.rc,*.dlg
GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS
Header=*.h,*.hh,*.hxx,*.hpp,*.H
Quellen=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l
groups=Header,Quellen,Benutzerschnittstelle,Übersetzungen,GNU,Andere
Übersetzungen=*.po
[Makefile.am]
files=kdiff3.kdevprj,admin,AUTHORS,COPYING,ChangeLog,INSTALL,README,kdiff3.lsm
sub_dirs=kdiff3,po,doc
type=normal
[README]
dist=true
install=false
install_location=
type=DATA
[admin]
dist=true
install=false
install_location=
type=DATA
[doc/Makefile.am]
sub_dirs=en
type=normal
[doc/en/Makefile.am]
files=doc/en/screenshot_diff.png,doc/en/screenshot_merge.png,doc/en/index.html,doc/en/background.png,doc/en/letter_by_letter.png,doc/en/triple_diff.png,doc/en/white_space.png,doc/en/open_dialog.png
sub_dirs=
type=normal
[doc/en/background.png]
dist=true
install=false
install_location=
type=DATA
[doc/en/index.html]
dist=true
install=false
install_location=
type=DATA
[doc/en/letter_by_letter.png]
dist=true
install=false
install_location=
type=DATA
[doc/en/open_dialog.png]
dist=true
install=false
install_location=
type=DATA
[doc/en/screenshot_diff.png]
dist=true
install=false
install_location=
type=DATA
[doc/en/screenshot_merge.png]
dist=true
install=false
install_location=
type=DATA
[doc/en/triple_diff.png]
dist=true
install=false
install_location=
type=DATA
[doc/en/white_space.png]
dist=true
install=false
install_location=
type=DATA
[kdiff3.kdevprj]
dist=true
install=false
install_location=
type=DATA
[kdiff3.lsm]
dist=true
install=false
install_location=
type=DATA
[kdiff3/Makefile.am]
files=kdiff3/main.cpp,kdiff3/kdiff3.cpp,kdiff3/kdiff3.h,kdiff3/kdiff3ui.rc,kdiff3/kdiff3.desktop,kdiff3/lo32-app-kdiff3.png,kdiff3/lo16-app-kdiff3.png,kdiff3/diff.h,kdiff3/diff.cpp,kdiff3/difftextwindow.cpp,kdiff3/mergeresultwindow.cpp,kdiff3/pdiff.cpp,kdiff3/merger.cpp,kdiff3/merger.h,kdiff3/optiondialog.cpp,kdiff3/optiondialog.h,kdiff3/hi32-app-kdiff3.png,kdiff3/hi16-app-kdiff3.png
sub_dirs=
type=prog_main
[kdiff3/diff.cpp]
dist=true
install=false
install_location=
type=SOURCE
[kdiff3/diff.h]
dist=true
install=false
install_location=
type=HEADER
[kdiff3/difftextwindow.cpp]
dist=true
install=false
install_location=
type=SOURCE
[kdiff3/hi16-app-kdiff3.png]
dist=true
install=true
install_location=$$(kde_icondir)/hicolor/16x16/apps/kdiff3.png
type=DATA
[kdiff3/hi32-app-kdiff3.png]
dist=true
install=true
install_location=$$(kde_icondir)/hicolor/32x32/apps/kdiff3.png
type=DATA
[kdiff3/kdiff3.cpp]
dist=true
install=false
install_location=
type=SOURCE
[kdiff3/kdiff3.desktop]
dist=true
install=true
install_location=$$(kde_appsdir)/Applications/kdiff3.desktop
type=DATA
[kdiff3/kdiff3.h]
dist=true
install=false
install_location=
type=HEADER
[kdiff3/kdiff3ui.rc]
dist=true
install=false
install_location=
type=DATA
[kdiff3/lo16-app-kdiff3.png]
dist=true
install=true
install_location=$$(kde_icondir)/locolor/16x16/apps/kdiff3.png
type=DATA
[kdiff3/lo32-app-kdiff3.png]
dist=true
install=true
install_location=$$(kde_icondir)/locolor/32x32/apps/kdiff3.png
type=DATA
[kdiff3/main.cpp]
dist=true
install=false
install_location=
type=SOURCE
[kdiff3/merger.cpp]
dist=true
install=false
install_location=
type=SOURCE
[kdiff3/merger.h]
dist=true
install=false
install_location=
type=HEADER
[kdiff3/mergeresultwindow.cpp]
dist=true
install=false
install_location=
type=SOURCE
[kdiff3/optiondialog.cpp]
dist=true
install=false
install_location=
type=SOURCE
[kdiff3/optiondialog.h]
dist=true
install=false
install_location=
type=HEADER
[kdiff3/pdiff.cpp]
dist=true
install=false
install_location=
type=SOURCE
[po/Makefile.am]
files=
sub_dirs=
type=po
Begin3
Title: KDiff3
Version: 0.81
Entered-date:
Description:
Keywords:
Author: Joachim Eibl <joachim.eibl@gmx.de>
Maintained-by: Joachim Eibl <joachim.eibl@gmx.de>
Primary-site:
Home-page: http://kdiff3.sourceforge.net
Original-site:
Platforms: Linux and other Unices
Copying-policy: GNU Public License
End