# HG changeset patch # User joachim99 # Date 1231264289 0 # Node ID fcd146072e0c6c621aafc635dc7e9175cf00e8f4 # Parent 881e47f5076b2793db6b17c3ac83b71a1a19bfc3 0.9.93 diff -r 881e47f5076b -r fcd146072e0c kdiff3/ChangeLog --- a/kdiff3/ChangeLog Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/ChangeLog Tue Jan 06 17:51:29 2009 +0000 @@ -1,3 +1,11 @@ +Version 0.9.93 - 2008/01/06 +=========================== +- Support for KDE4 (with much porting help from Valentin Rusu) +- Fix for diff_ext_for_kdiff3 (by Sergey Zorin) +- Win32-Installation: SendTo-integration fixed for Vista. +- Optional auto detection of line end style for saving. +- Option to close on ESC (default is off) + Version 0.9.92 - 2007/04/15 =========================== - Windows installer now allows to install KDiff3 as Clearcase Diff and Merge Tool diff -r 881e47f5076b -r fcd146072e0c kdiff3/INSTALL --- a/kdiff3/INSTALL Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/INSTALL Tue Jan 06 17:51:29 2009 +0000 @@ -1,168 +1,4 @@ -Basic Installation -================== +Please read the README-file. - These are generic installation instructions. - Please read the README-file for most needed steps first. +Joachim - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes a while. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Type `make install' to install the programs and any data files and - documentation. - - 4. You can remove the program binaries and object files from the - source code directory by typing `make clean'. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure - -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: - CPU-COMPANY-SYSTEM - -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. - - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Operation Controls -================== - - `configure' recognizes the following options to control how it -operates. - -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - -`--help' - Print a summary of the options to `configure', and exit. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`configure' also accepts some other, not widely useful, options. - diff -r 881e47f5076b -r fcd146072e0c kdiff3/README --- a/kdiff3/README Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/README Tue Jan 06 17:51:29 2009 +0000 @@ -2,24 +2,50 @@ ============= Author: Joachim Eibl (joachim.eibl at gmx.de) -Copyright: (C) 2002-2006 by Joachim Eibl -KDiff3-Version: 0.9.92 +Copyright: (C) 2002-2008 by Joachim Eibl +KDiff3-Version: 0.9.93 +KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. +These are available for Un*x, Windows, Mac. +Thus there are many setup possibilities to consider. + +From version 0.9.93 on the main target platform is KDE4/Qt4. +For KDiff3 for KDE3/Qt3 use KDiff3-0.9.92 or older. + +Contents +-------- + +- Introduction +- License +- Requirements & Installation + - For KDE4 + - With Qt4-libs, without KDE + - for Linux/Un*x + - for Windows + - Debugging with MinGW under Windows: + - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary +- Additional hints + + +Introduction +------------ KDiff3 is a program that - compares and merges two or three input files or directories, - 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 -- has support for KDE-KIO (ftp, sftp, http, fish, smb) -- and has an intuitive graphical user interface, -- also supports 64 bit systems. (Some build issues are discussed in here.) - +- has support for KDE-KIO (ftp, sftp, http, fish, smb), +- has an intuitive graphical user interface, +- provides a context menu for KDE-Konqueror and Windows-Explorer, +- supports 64 bit systems. (Some build issues are discussed in here.) Do you want help translating? Read the README in the po-subdirectory! -License: +License +------- + GNU GENERAL PUBLIC LICENSE, Version 2, June 1991 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 @@ -39,242 +65,143 @@ 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) + to link this program with the Qt-library (commercial or open source 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.9.91 provides special support for KDE3, but it can also be - built without KDE3 if the Qt-libraries are available. - (I also test and use the program under Windows.) - It is now also possible to build with Qt4 (See further below). +Requirements & Installation +--------------------------- + +- for KDE4: + From version 0.9.93 on KDiff3 supports KDE4. + For installation on most distributions you usually also require these packages (names as on opensuse): + - g++ (g++, version 3.4 or newer) + - libqt4-devel (Qt4-libs, version 4.4.0 or newer) + - libkde4-devel (KDE4 Header files and development libraries) + - libkonq-devel (optional, needed for the kdiff3-plugin, if not installed + then the contextmenu plugin for konqueror won't be built.) + - cmake (>2.6, checks dependencies and creates the Makefiles appopriate for your system) + + Typically in a terminal (e.g. konsole) you cd into the kdiff3-directory and run these commands. + + mkdir release # create sub directory + cd release # cd into that directory + kde4-config --prefix # Find out your KDE4-directory and note the result + cmake .. -DCMAKE_INSTALL_PREFIX= # create Makefile, replace with the prior result + make # run make (compile and link) + sudo make install # install as root user + + Now KDiff3 should be ready to use. Type "kdiff3" to start it. + There should also be a entry in your KDE-start menu in "(Applications->)Development". + + For creating a debug version: + mkdir debug + cd debug + kde4-config --prefix # Find out your KDE4-directory and note the result + cmake .. -DCMAKE_INSTALL_PREFIX= -DCMAKE_BUILD_TYPE=debugfull + make + sudo make install + + The depends on your distribution: + The command "kde4-config --prefix" should tell you. + - For opensuse 11 use "/usr". + +- Building KDiff3 with Qt4-libs, but without KDE + - for Linux/Un*x + - for Windows + - for Mac + + The version 0.9.93 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. You always need - - kdiff3-0.9.91.tar.gz - - For building the KDE3-version - - KDE>=3.3 and QT>=3.3-libraries. (but not with KDE4) - - gcc, g++ with version >=3.2 - - For building the Qt-only-version - - QT-libraries (version >=3.3.0, but <4.0 or >=4.2.0). - (www.trolltech.com) - - for Un*x: gcc, g++ with version >=3.2 - - for Windows: VC6 / VC7.1 - - On some distributions it will be necessary to install developer - packages (RPMs) that contain include files for compilation: - - xorg-x11-devel (or x11-devel) - - qt-devel - - kdelibs-devel - -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) - - cd into the directory kdiff3-0.9.91 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 your KDE3 installation is located and - use that directory with the prefix-option of configure. - - This command should tell you: kde-config --prefix - - For SuSE and most distributions the prefix usually is /opt/kde3. - For Redhat/Fedora 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"`) - - On Fedora-64-bit systems the following configure-line was reported to work: - ./configure --prefix=`kde-config --prefix` --enable-libsuffix=64 --with-qt-libraries=/usr/lib64/qt-3.3/lib/ - Both --enable-libsuffix=64 and -with-qt-libraries=/usr/lib64/qt-3.3/lib/ are needed; - without the first one it fails to find the KDE libraries, - and without the second one it fails to find libqt-mt - (strangely enough: libqt-mt is in /usr/lib64/qt-3.3/lib, - and "configure" tries /usr/lib64/qt-3.3/lib64) - If your qt-libraries are elsewhere please adapt the path accordingly. - - Some secondary dependencies aren't correctly discovered by configure. - If e.g the a linker error appears telling you something like - "Can't find -lacl" this probably means that you have to install - libacl-devel-*.rpm etc. - - If you run an older version of KDE and the make-process fails in the - doc- or po-directory, cd to the src-directory and run "make" there. Also run - "make install" there. This hopefully will create a working kdiff3-binary, - although without doc and language support. - -Upgrading KDiff3 for KDE: - If you already installed an older version or KDiff3 and you have the - impression, that the new version doesn't work as described, you should try to - remove all files belonging to KDiff3 before reinstalling. - Try this search command to locate KDiff3-related files: - find $HOME/.kde /usr /opt -iname "*kdiff3*" - (Will take a few minutes.) - - -Building an RPM for Fedora Core (by Vadim Likhota) - Copy kdiff3-0.9.91.tar.gz into /usr/src/redhat/SOURCE - Copy kdiff3.spec into /usr/src/redhat/SPEC - Run rpmbuild -bb --target i686 kdiff3.spec - Find kdiff3-0.9.91-fc.i686.rpm in /usr/src/redhat/RPMS/I386 - - -Installation for the Qt-only-platforms for Un*x: - (for Qt >=3.3.0 but <4.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.91/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 - If you want to build the Qt-only version _and_ the KDE-version, do this - in separate directories, otherwise there will be errors. - - A user reported that on his 64-bit machine running FC4 he had to edit his Makefile.qt - LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/lib -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread - - -Build for Windows: - Use qmake and kdiff3.pro to generate - an appropriate Makefile. - qmake kdiff3.pro -o Makefile - - -Building KDiff3 (Qt3) for Mac OSX 10.3.8 (by Mark Teel) -------------------------------------------------------- - 1) Install Qt/Mac with thread support and static libraries. - 2) cd .../kdiff3-0.9.91/src - 3) Create a makefile for kdiff3 by executing: - qmake kdiff3.pro -o Makefile.qt - 4) Edit Makefile.qt and change the include path like so: - (old) INCPATH = -I/Library/qt3/mkspecs/default -Isrc ... - (new) INCPATH = -I/Library/qt3/mkspecs/macx-g++ -Isrc ... - 5) Execute: - make -f Makefile.qt - 6) After the build completes copy kdiff3 from the kdiff3-0.9.91/src directory to - /Applications - -Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt) ---------------------------------------------------------------------------------------------------- - 1) Install Qt/Mac 4.x with thread support, static libraries and universal flag. - 2) cd .../kdiff3-0.9.91/src-QT4 - 3a) Create a makefile for kdiff3 by executing: - qmake kdiff3.pro - 3b) optionally generate XCode-Project (for debugging purposes only) by executing: - qmake -spec macx-xcode kdiff3.pro - 4) Execute: - make - 5) After the build completes copy kdiff3 from the kdiff3-0.9.91/src-QT4 directory to - /Applications - ----------------------------------------------------------------- - -Building KDiff3 with Qt4: - -Requirements & Installation: - The version 0.9.91 requires Qt 4.2.0 (from www.trolltech.com) for compilation. - - You always need - - kdiff3-0.9.91.tar.gz + - kdiff3-0.9.93.tar.gz - for Un*x: gcc, g++ with version >=3.4.2 Qt-X11-libraries - for Windows: Qt-win-libs - If you have the Qt4 commercial edition, then compile with Visual Studio. + If you have the Qt4 commercial edition, then compile with Visual Studio.NET2003 or newer. If you use the Qt4 open source edition, then you'll need MinGW. I verified that compilation and debugging works with these packages (probably newer ones will also work): - - gcc-core-3.4.2-20040916-1.tar.gz - - binutils-2.15.91-20040904-1.tar.gz - - gcc-g++-3.4.2-20040916-1.tar.gz - - mingw-runtime-3.9.tar.gz - - mingw32-make-3.80.0-3.tar.gz - - w32api-3.6.tar.gz (see also the note below) - - gdb-5.2.1-1.exe (for debugging) - - (Note: At the time of writing this README, the MinGW-package that was part - of qt-win-opensource-4.1.2-mingw.exe lacked the latest w32api needed for - KDiff3-compilation. You will need to unpack w32api-3.6.tar.gz or newer - from www.mingw.org into your MinGW-directory.) + - Use MinGW-5.1.4.exe or newer to install the following or newer: + - gcc-core-3.4.5-20060117-1.tar.gz + - binutils-2.17.50-20060824-1.tar.gz + - gcc-g++-3.4.5-20060117-1.tar.gz + - mingw-runtime-3.14.tar.gz + - mingw32-make-3.81-2.tar.gz + - w32api-3.11.tar.gz + - gdb-6.3-2.exe (for debugging) - for Mac: gcc, g++ with version >=3.4.2 Qt-Mac-libraries + - Optional: Qt Creator IDE: Development environment optimized for Qt (http://trolltech.com/developer/qt-creator) + Build-instructions (Un*x): + - Make sure your shell-variable QTDIR is correct and that + your path contains the Qt4-bin-directory. + - cd into the directory kdiff3-0.9.93/src-QT4 and type + - qmake kdiff3.pro + - make (or "gmake" for GNU-Make) -Note for KDE-users: - The version 0.9.91-Qt4 doesn't provide support for KDE-3.x - because KDE-3.x.y requires Qt3. - If you need KDE-specific features like KIO-support stick to the - normal version 0.9.91. + Build-instructions (Windows): + - set QTDIR= e.g.: c:\qt\4.4.1 + set "PATH=%QTDIR%\bin;%PATH%" + - cd into the directory kdiff3-0.9.93\src-Qt4 and type + - qmake kdiff3.pro + - Either "nmake" for Visual Studio or "mingw32-make" depending on what you have. -Build-instructions (Unix or Mac): - - Make sure your shell-variable QTDIR is correct and that - your path contains the Qt4-bin-directory. - - cd into the directory kdiff3-0.9.91/src-QT4 and type - - qmake kdiff3.pro - - make (or "gmake" for GNU-Make) + Debugging with MinGW under Windows: + - Qt Creator worked very good as debugger frontend too! + - Debugging without gdb on the console: + - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You will have to compile the + debug dlls yourself. Enter the qt-4.4.1-directory and run "configure -debug" and then "mingw32-make". + - cd into the directory kdiff3-0.9.93\src-Qt4 + - edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console" + (this is necessary so that gdb can send a break signal to the running program) + - mingw32-make debug (create a debuggable executable) + - gdb debug\kdiff3.exe + - At the "(gdb)"-prompt type "run" and enter to start. + - While the program runs you can't set breakpoints, first interrupt it with Ctrl-C. + - Use "help" to find out about how to use gdb. (Important commands: run, break, backtrace, print, quit) + Using break with c++-methods requires to specify the parameter types too. Breakpoints in constructors might not work. -Build-instructions (Windows): - - Run your qtvars.bat in the Qt4-bin directory. - (This should set your QTDIR, QMAKESPEC and PATH-environment-variables.) - - cd into the directory kdiff3-0.9.91/src-Qt4 and type - - qmake kdiff3.pro - - make (which calls either "mingw32-make" or "nmake") + Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt) + 1) Install Qt/Mac 4.x with thread support, static libraries and universal flag. + (For Qt4 run "configure -static"; only necessary if the final binary should not require shared Qt4-libs.) + 2) cd .../kdiff3-0.9.93/src-QT4 + 3a) Create a makefile for kdiff3 by executing: + qmake kdiff3.pro + 3b) optionally generate XCode-Project (for debugging purposes only) by executing: + qmake -spec macx-xcode kdiff3.pro + 4) Execute: + make + 5) After the build completes copy kdiff3 from the kdiff3-0.9.93/src-QT4 directory to + /Applications -Debugging with MinGW under Windows: -- The qt-win-opensource-4.2.0-mingw.exe only installs release dlls. You will have to compile the - debug dlls yourself. Enter the qt-4.2.0-directory and run "configure -debug" and then "make". -- cd into the directory kdiff3-0.9.91/src-Qt4 -- edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console" - (this is necessary so that gdb can send a break signal to the running program) -- make debug (create a debuggable executable) -- gdb debug\kdiff3.exe -- At the "(gdb)"-prompt type "run" and enter to start. -- While the program runs you can't set breakpoints, first interrupt it with Ctrl-C. -- Use "help" to find out about how to use gdb. (Important commands: run, break, backtrace, print, quit) - Using break with c++-methods requires to specify the parameter types too. Breakpoints in constructors might not work. -- I've tested graphical gdb-frontends too: - 1. Insight (also from mingw.org) worked until I wanted to interrupt the program for setting breakpoints. - 2. Dev-Cpp: The debugger said that the app crashed before even launching it. - Result: For Windows I recommend gdb on the console. Please tell me when things have improved! (End of KDiff3 with Qt4-instructions) ------------------------------------------------------------------------ +Additional hints +---------------- -Start from commandline: -- Comparing 2 files: kdiff3 file1 file2 -- Merging 2 files: kdiff3 file1 file2 -o outputfile -- Comparing 3 files: kdiff3 file1 file2 file3 -- Merging 3 files: kdiff3 file1 file2 file3 -o outputfile - Note that file1 will be treated as base of file2 and file3. + Start from commandline: + - Comparing 2 files: kdiff3 file1 file2 + - Merging 2 files: kdiff3 file1 file2 -o outputfile + - Comparing 3 files: kdiff3 file1 file2 file3 + - 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 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. + If you start without arguments, then a dialog will appear where you can + select your files via a filebrowser. -For more documentation, see the help-menu or the subdirectory doc. + For more documentation, see the help-menu or the subdirectory doc. -Have fun! + Have fun! diff -r 881e47f5076b -r fcd146072e0c kdiff3/TODO --- a/kdiff3/TODO Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/TODO Tue Jan 06 17:51:29 2009 +0000 @@ -2,6 +2,10 @@ TODO ==== +- Verknüpfungsziel für Links relativ anzeigen +- KDiff3-Plugin sollte auch in Dolphin arbeiten +- Alignmenttechnik bei Merge von 3 Dateien wählbar +- Horizontales Scrolling reparieren - Fix drawing in columns A/B/C-directory window - Qt4-translation files diff -r 881e47f5076b -r fcd146072e0c kdiff3/diff_ext_for_kdiff3/diff_ext.cpp --- a/kdiff3/diff_ext_for_kdiff3/diff_ext.cpp Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/diff_ext_for_kdiff3/diff_ext.cpp Tue Jan 06 17:51:29 2009 +0000 @@ -371,7 +371,7 @@ tstring firstFileName; if( nrOfRecentFiles>=1 ) { - tstring firstFileName = TEXT("'") + cut_to_length( m_recentFiles.front() ) + TEXT("'"); + firstFileName = TEXT("'") + cut_to_length( m_recentFiles.front() ) + TEXT("'"); } replaceArgs( menuStringCompare, firstFileName ); replaceArgs( menuStringMerge, firstFileName ); @@ -504,6 +504,10 @@ ERRORLOG(verb); } } + else + { + ret = E_INVALIDARG; + } return ret; } diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/Makefile.am --- a/kdiff3/doc/Makefile.am Tue Jan 06 17:15:53 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# the SUBDIRS is filled automatically by am_edit. If files are -# in this directory they are installed into the english dir - -KDE_LANG = en da de es et fr it nl pt sv -KDE_DOCS = kdiff3 -SUBDIRS = $(AUTODIRS) diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/createpdfdoc --- a/kdiff3/doc/createpdfdoc Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/doc/createpdfdoc Tue Jan 06 17:51:29 2009 +0000 @@ -1,8 +1,14 @@ +# html2ps is from the "html2ps"-package +# ps2pdf is part of the "ghostscript-library"-package for i in `find * -maxdepth 0 -type d`; do -cd $i -echo $i -LANG=de_DE meinproc --check index.docbook --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-nochunk.xsl -html2ps -D -u -n index.html >index.ps -ps2pdf index.ps ../kdiff3_$i.pdf -cd .. + cd $i + echo $i + if [ $i != "en" ]; then + for j in `ls ../en | grep png`; do ln -s ../en/$j $j; done + ln -s ../en/common common + fi + LANG=de_DE meinproc4 --check index.docbook --stylesheet /usr/share/kde4/apps/ksgmltools2/customization/kde-nochunk.xsl + html2ps --rcfile /usr/lib/html2ps/html2psrc -D -u -n index.html >index.ps + ps2pdf index.ps ../kdiff3_$i.pdf + cd .. done diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/da/Makefile.am --- a/kdiff3/doc/da/Makefile.am Tue Jan 06 17:15:53 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -KDE_DOCS = kdiff3 -KDE_LANG = da - - diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/de/Makefile.am --- a/kdiff3/doc/de/Makefile.am Tue Jan 06 17:15:53 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -KDE_DOCS = kdiff3 -KDE_LANG = de - - diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/Makefile.am --- a/kdiff3/doc/en/Makefile.am Tue Jan 06 17:15:53 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -KDE_DOCS = kdiff3 -KDE_LANG = en -man1_MANS=kdiff3.1 - - diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/bottom-left.png Binary file kdiff3/doc/en/common/bottom-left.png has changed diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/bottom-middle.png Binary file kdiff3/doc/en/common/bottom-middle.png has changed diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/bottom-right.png Binary file kdiff3/doc/en/common/bottom-right.png has changed diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/fdl-license.html --- a/kdiff3/doc/en/common/fdl-license.html Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/doc/en/common/fdl-license.html Tue Jan 06 17:51:29 2009 +0000 @@ -12,342 +12,501 @@ -

GNU Free Documentation License

- Version 1.1, March 2000 +

GNU Free Documentation License

+

+ Version 1.2, November 2002 +

-

Copyright (C) 2000 Free Software Foundation, Inc. - 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.

+
+  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+
-

0. Preamble

+

+ 0. PREAMBLE +

-

The purpose of this License is to make a manual, textbook, or other -written document "free" in the sense of freedom: to assure everyone -the effective freedom to copy and redistribute it, with or without -modifying it, either commercially or noncommercially. Secondarily, -this License preserves for the author and publisher a way to get -credit for their work, while not being considered responsible for -modifications made by others.

+

+ The purpose of this License is to make a manual, textbook, or other + functional and useful document "free" in the sense of freedom: to + assure everyone the effective freedom to copy and redistribute it, + with or without modifying it, either commercially or noncommercially. + Secondarily, this License preserves for the author and publisher a way + to get credit for their work, while not being considered responsible + for modifications made by others. +

-

This License is a kind of "copyleft", which means that derivative -works of the document must themselves be free in the same sense. It -complements the GNU General Public License, which is a copyleft -license designed for free software.

+

+ This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. It + complements the GNU General Public License, which is a copyleft + license designed for free software. +

-

We have designed this License in order to use it for manuals for free -software, because free software needs free documentation: a free -program should come with manuals providing the same freedoms that the -software does. But this License is not limited to software manuals; -it can be used for any textual work, regardless of subject matter or -whether it is published as a printed book. We recommend this License -principally for works whose purpose is instruction or reference.

+

+ We have designed this License in order to use it for manuals for free + software, because free software needs free documentation: a free + program should come with manuals providing the same freedoms that the + software does. But this License is not limited to software manuals; + it can be used for any textual work, regardless of subject matter or + whether it is published as a printed book. We recommend this License + principally for works whose purpose is instruction or reference. +

-

1. Applicability And Definitions

+

+ 1. APPLICABILITY AND DEFINITIONS +

-

This License applies to any manual or other work that contains a -notice placed by the copyright holder saying it can be distributed -under the terms of this License. The "Document", below, refers to any -such manual or work. Any member of the public is a licensee, and is -addressed as "you".

+

+ This License applies to any manual or other work, in any medium, that + contains a notice placed by the copyright holder saying it can be + distributed under the terms of this License. Such a notice grants a + world-wide, royalty-free license, unlimited in duration, to use that + work under the conditions stated herein. The "Document", below, + refers to any such manual or work. Any member of the public is a + licensee, and is addressed as "you". You accept the license if you + copy, modify or distribute the work in a way requiring permission + under copyright law. +

-

A "Modified Version" of the Document means any work containing the -Document or a portion of it, either copied verbatim, or with -modifications and/or translated into another language.

+

+ A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. +

-

A "Secondary Section" is a named appendix or a front-matter section of -the Document that deals exclusively with the relationship of the -publishers or authors of the Document to the Document's overall subject -(or to related matters) and contains nothing that could fall directly -within that overall subject. (For example, if the Document is in part a -textbook of mathematics, a Secondary Section may not explain any -mathematics.) The relationship could be a matter of historical -connection with the subject or with related matters, or of legal, -commercial, philosophical, ethical or political position regarding -them.

+

+ A "Secondary Section" is a named appendix or a front-matter section of + the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall subject + (or to related matters) and contains nothing that could fall directly + within that overall subject. (Thus, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of legal, + commercial, philosophical, ethical or political position regarding + them. +

-

The "Invariant Sections" are certain Secondary Sections whose titles -are designated, as being those of Invariant Sections, in the notice -that says that the Document is released under this License.

+

+ The "Invariant Sections" are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the notice + that says that the Document is released under this License. If a + section does not fit the above definition of Secondary then it is not + allowed to be designated as Invariant. The Document may contain zero + Invariant Sections. If the Document does not identify any Invariant + Sections then there are none. +

-

The "Cover Texts" are certain short passages of text that are listed, -as Front-Cover Texts or Back-Cover Texts, in the notice that says that -the Document is released under this License.

+

+ The "Cover Texts" are certain short passages of text that are listed, + as Front-Cover Texts or Back-Cover Texts, in the notice that says that + the Document is released under this License. A Front-Cover Text may + be at most 5 words, and a Back-Cover Text may be at most 25 words. +

-

A "Transparent" copy of the Document means a machine-readable copy, -represented in a format whose specification is available to the -general public, whose contents can be viewed and edited directly and -straightforwardly with generic text editors or (for images composed of -pixels) generic paint programs or (for drawings) some widely available -drawing editor, and that is suitable for input to text formatters or -for automatic translation to a variety of formats suitable for input -to text formatters. A copy made in an otherwise Transparent file -format whose markup has been designed to thwart or discourage -subsequent modification by readers is not Transparent. A copy that is -not "Transparent" is called "Opaque".

+

+ A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, that is suitable for revising the document + straightforwardly with generic text editors or (for images composed of + pixels) generic paint programs or (for drawings) some widely available + drawing editor, and that is suitable for input to text formatters or + for automatic translation to a variety of formats suitable for input + to text formatters. A copy made in an otherwise Transparent file + format whose markup, or absence of markup, has been arranged to thwart + or discourage subsequent modification by readers is not Transparent. + An image format is not Transparent if used for any substantial amount + of text. A copy that is not "Transparent" is called "Opaque". +

-

Examples of suitable formats for Transparent copies include plain -ASCII without markup, Texinfo input format, LaTeX input format, SGML -or XML using a publicly available DTD, and standard-conforming simple -HTML designed for human modification. Opaque formats include -PostScript, PDF, proprietary formats that can be read and edited only -by proprietary word processors, SGML or XML for which the DTD and/or -processing tools are not generally available, and the -machine-generated HTML produced by some word processors for output -purposes only.

+

+ Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, SGML + or XML using a publicly available DTD, and standard-conforming simple + HTML, PostScript or PDF designed for human modification. Examples of + transparent image formats include PNG, XCF and JPG. Opaque formats + include proprietary formats that can be read and edited only by + proprietary word processors, SGML or XML for which the DTD and/or + processing tools are not generally available, and the + machine-generated HTML, PostScript or PDF produced by some word + processors for output purposes only. +

-

The "Title Page" means, for a printed book, the title page itself, -plus such following pages as are needed to hold, legibly, the material -this License requires to appear in the title page. For works in -formats which do not have any title page as such, "Title Page" means -the text near the most prominent appearance of the work's title, -preceding the beginning of the body of the text.

+

+ The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the material + this License requires to appear in the title page. For works in + formats which do not have any title page as such, "Title Page" means + the text near the most prominent appearance of the work's title, + preceding the beginning of the body of the text. +

-

2. Verbatim Copying

+

+ A section "Entitled XYZ" means a named subunit of the Document whose + title either is precisely XYZ or contains XYZ in parentheses following + text that translates XYZ in another language. (Here XYZ stands for a + specific section name mentioned below, such as "Acknowledgements", + "Dedications", "Endorsements", or "History".) To "Preserve the Title" + of such a section when you modify the Document means that it remains a + section "Entitled XYZ" according to this definition. +

-

You may copy and distribute the Document in any medium, either -commercially or noncommercially, provided that this License, the -copyright notices, and the license notice saying this License applies -to the Document are reproduced in all copies, and that you add no other -conditions whatsoever to those of this License. You may not use -technical measures to obstruct or control the reading or further -copying of the copies you make or distribute. However, you may accept -compensation in exchange for copies. If you distribute a large enough -number of copies you must also follow the conditions in section 3.

+

+ The Document may include Warranty Disclaimers next to the notice which + states that this License applies to the Document. These Warranty + Disclaimers are considered to be included by reference in this + License, but only as regards disclaiming warranties: any other + implication that these Warranty Disclaimers may have is void and has + no effect on the meaning of this License. +

-

You may also lend copies, under the same conditions stated above, and -you may publicly display copies.

+

+ 2. VERBATIM COPYING +

-

3. Copying In Quantity

+

+ You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License applies + to the Document are reproduced in all copies, and that you add no other + conditions whatsoever to those of this License. You may not use + technical measures to obstruct or control the reading or further + copying of the copies you make or distribute. However, you may accept + compensation in exchange for copies. If you distribute a large enough + number of copies you must also follow the conditions in section 3. +

-

If you publish printed copies of the Document numbering more than 100, -and the Document's license notice requires Cover Texts, you must enclose -the copies in covers that carry, clearly and legibly, all these Cover -Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on -the back cover. Both covers must also clearly and legibly identify -you as the publisher of these copies. The front cover must present -the full title with all words of the title equally prominent and -visible. You may add other material on the covers in addition. -Copying with changes limited to the covers, as long as they preserve -the title of the Document and satisfy these conditions, can be treated -as verbatim copying in other respects.

+

+ You may also lend copies, under the same conditions stated above, and + you may publicly display copies. +

-

If the required texts for either cover are too voluminous to fit -legibly, you should put the first ones listed (as many as fit -reasonably) on the actual cover, and continue the rest onto adjacent -pages.

+

+ 3. COPYING IN QUANTITY +

-

If you publish or distribute Opaque copies of the Document numbering -more than 100, you must either include a machine-readable Transparent -copy along with each Opaque copy, or state in or with each Opaque copy -a publicly-accessible computer-network location containing a complete -Transparent copy of the Document, free of added material, which the -general network-using public has access to download anonymously at no -charge using public-standard network protocols. If you use the latter -option, you must take reasonably prudent steps, when you begin -distribution of Opaque copies in quantity, to ensure that this -Transparent copy will remain thus accessible at the stated location -until at least one year after the last time you distribute an Opaque -copy (directly or through your agents or retailers) of that edition to -the public.

+

+ If you publish printed copies (or copies in media that commonly have + printed covers) of the Document, numbering more than 100, and the + Document's license notice requires Cover Texts, you must enclose the + copies in covers that carry, clearly and legibly, all these Cover + Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on + the back cover. Both covers must also clearly and legibly identify + you as the publisher of these copies. The front cover must present + the full title with all words of the title equally prominent and + visible. You may add other material on the covers in addition. + Copying with changes limited to the covers, as long as they preserve + the title of the Document and satisfy these conditions, can be treated + as verbatim copying in other respects. +

-

It is requested, but not required, that you contact the authors of the -Document well before redistributing any large number of copies, to give -them a chance to provide you with an updated version of the Document.

+

+ If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto adjacent + pages. +

-

4. Modifications

+

+ If you publish or distribute Opaque copies of the Document numbering + more than 100, you must either include a machine-readable Transparent + copy along with each Opaque copy, or state in or with each Opaque copy + a computer-network location from which the general network-using + public has access to download using public-standard network protocols + a complete Transparent copy of the Document, free of added material. + If you use the latter option, you must take reasonably prudent steps, + when you begin distribution of Opaque copies in quantity, to ensure + that this Transparent copy will remain thus accessible at the stated + location until at least one year after the last time you distribute an + Opaque copy (directly or through your agents or retailers) of that + edition to the public. +

-

You may copy and distribute a Modified Version of the Document under -the conditions of sections 2 and 3 above, provided that you release -the Modified Version under precisely this License, with the Modified -Version filling the role of the Document, thus licensing distribution -and modification of the Modified Version to whoever possesses a copy -of it. In addition, you must do these things in the Modified Version:

+

+ It is requested, but not required, that you contact the authors of the + Document well before redistributing any large number of copies, to give + them a chance to provide you with an updated version of the Document. +

-
    -
  1. Use in the Title Page (and on the covers, if any) a title distinct - from that of the Document, and from those of previous versions - (which should, if there were any, be listed in the History section - of the Document). You may use the same title as a previous - version if the original publisher of that version gives - permission.
    2. +

    + 4. MODIFICATIONS +

    -
  2. List on the Title Page, as authors, one or more persons or - entities responsible for authorship of the modifications in the - Modified Version, together with at least five of the principal - authors of the Document (all of its principal authors, if it has - less than five).
    3. +

    + You may copy and distribute a Modified Version of the Document under + the conditions of sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the Modified + Version filling the role of the Document, thus licensing distribution + and modification of the Modified Version to whoever possesses a copy + of it. In addition, you must do these things in the Modified Version: +

    -
  3. State on the Title page the name of the publisher of the Modified - Version, as the publisher.
    4. +
      +
    • A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission.
      • +
    • B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement.
      • +
    • C. State on the Title page the name of the publisher of the + Modified Version, as the publisher.
      • +
    • D. Preserve all the copyright notices of the Document.
      • +
    • E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices.
      • +
    • F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below.
      • +
    • G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice.
      • +
    • H. Include an unaltered copy of this License.
      • +
    • I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence.
      • +
    • J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission.
      • +
    • K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein.
      • +
    • L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles.
      • +
    • M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version.
      • +
    • N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section.
      • +
    • O. Preserve any Warranty Disclaimers.
      • +
    -
  4. Preserve all the copyright notices of the Document.
    5. +

    + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no material + copied from the Document, you may at your option designate some or all + of these sections as invariant. To do this, add their titles to the + list of Invariant Sections in the Modified Version's license notice. + These titles must be distinct from any other section titles. +

    -
  5. Add an appropriate copyright notice for your modifications - adjacent to the other copyright notices.
    6. +

    + You may add a section Entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text has + been approved by an organization as the authoritative definition of a + standard. +

    -
  6. Include, immediately after the copyright notices, a license notice - giving the public permission to use the Modified Version under the - terms of this License, in the form shown in the Addendum - below.
    7. +

    + You may add a passage of up to five words as a Front-Cover Text, and a + passage of up to 25 words as a Back-Cover Text, to the end of the list + of Cover Texts in the Modified Version. Only one passage of + Front-Cover Text and one of Back-Cover Text may be added by (or + through arrangements made by) any one entity. If the Document already + includes a cover text for the same cover, previously added by you or + by arrangement made by the same entity you are acting on behalf of, + you may not add another; but you may replace the old one, on explicit + permission from the previous publisher that added the old one. +

    -
  7. Preserve in that license notice the full lists of Invariant - Sections and required Cover Texts given in the Document's license - notice.
    8. +

    + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to assert or + imply endorsement of any Modified Version. +

    -
  8. Include an unaltered copy of this License.
    9. +

    + 5. COMBINING DOCUMENTS +

    -
  9. Preserve the section entitled "History", and its title, and add to - it an item stating at least the title, year, new authors, and - publisher of the Modified Version as given on the Title Page. If - there is no section entitled "History" in the Document, create one - stating the title, year, authors, and publisher of the Document as - given on its Title Page, then add an item describing the Modified - Version as stated in the previous sentence.
    10. +

    + You may combine the Document with other documents released under this + License, under the terms defined in section 4 above for modified + versions, provided that you include in the combination all of the + Invariant Sections of all of the original documents, unmodified, and + list them all as Invariant Sections of your combined work in its + license notice, and that you preserve all their Warranty Disclaimers. +

    -
  10. Preserve the network location, if any, given in the Document for - public access to a Transparent copy of the Document, and likewise - the network locations given in the Document for previous versions - it was based on. These may be placed in the "History" section. - You may omit a network location for a work that was published at - least four years before the Document itself, or if the original - publisher of the version it refers to gives permission.
    11. - -
  11. In any section entitled "Acknowledgements" or "Dedications", - preserve the section's title, and preserve in the section all the - substance and tone of each of the contributor acknowledgements - and/or dedications given therein.
    12. +

    + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name but + different contents, make the title of each such section unique by + adding at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique number. + Make the same adjustment to the section titles in the list of + Invariant Sections in the license notice of the combined work. +

    -
  12. Preserve all the Invariant Sections of the Document, unaltered in - their text and in their titles. Section numbers or the equivalent - are not considered part of the section titles.
    13. +

    + In the combination, you must combine any sections Entitled "History" + in the various original documents, forming one section Entitled + "History"; likewise combine any sections Entitled "Acknowledgements", + and any sections Entitled "Dedications". You must delete all sections + Entitled "Endorsements." +

    -
  13. Delete any section entitled "Endorsements". Such a section may - not be included in the Modified Version.
    14. +

    + 6. COLLECTIONS OF DOCUMENTS +

    -
  14. Do not retitle any existing section as "Endorsements" or to - conflict in title with any Invariant Section.
    15. -
+

+ You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies of this + License in the various documents with a single copy that is included in + the collection, provided that you follow the rules of this License for + verbatim copying of each of the documents in all other respects. +

-

If the Modified Version includes new front-matter sections or -appendices that qualify as Secondary Sections and contain no material -copied from the Document, you may at your option designate some or all -of these sections as invariant. To do this, add their titles to the -list of Invariant Sections in the Modified Version's license notice. -These titles must be distinct from any other section titles.

+

+ You may extract a single document from such a collection, and distribute + it individually under this License, provided you insert a copy of this + License into the extracted document, and follow this License in all + other respects regarding verbatim copying of that document. +

-

You may add a section entitled "Endorsements", provided it contains -nothing but endorsements of your Modified Version by various -parties--for example, statements of peer review or that the text has -been approved by an organization as the authoritative definition of a -standard.

+

+ 7. AGGREGATION WITH INDEPENDENT WORKS +

-

You may add a passage of up to five words as a Front-Cover Text, and a -passage of up to 25 words as a Back-Cover Text, to the end of the list -of Cover Texts in the Modified Version. Only one passage of -Front-Cover Text and one of Back-Cover Text may be added by (or -through arrangements made by) any one entity. If the Document already -includes a cover text for the same cover, previously added by you or -by arrangement made by the same entity you are acting on behalf of, -you may not add another; but you may replace the old one, on explicit -permission from the previous publisher that added the old one.

+

+ A compilation of the Document or its derivatives with other separate + and independent documents or works, in or on a volume of a storage or + distribution medium, is called an "aggregate" if the copyright + resulting from the compilation is not used to limit the legal rights + of the compilation's users beyond what the individual works permit. + When the Document is included in an aggregate, this License does not + apply to the other works in the aggregate which are not themselves + derivative works of the Document. +

-

The author(s) and publisher(s) of the Document do not by this License -give permission to use their names for publicity for or to assert or -imply endorsement of any Modified Version.

+

+ If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one half of + the entire aggregate, the Document's Cover Texts may be placed on + covers that bracket the Document within the aggregate, or the + electronic equivalent of covers if the Document is in electronic form. + Otherwise they must appear on printed covers that bracket the whole + aggregate. +

-

5. Combining Documents

+

+ 8. TRANSLATION +

-

You may combine the Document with other documents released under this -License, under the terms defined in section 4 above for modified -versions, provided that you include in the combination all of the -Invariant Sections of all of the original documents, unmodified, and -list them all as Invariant Sections of your combined work in its -license notice.

+

+ Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. + Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License, and all the license notices in the + Document, and any Warranty Disclaimers, provided that you also include + the original English version of this License and the original versions + of those notices and disclaimers. In case of a disagreement between + the translation and the original version of this License or a notice + or disclaimer, the original version will prevail. +

-

The combined work need only contain one copy of this License, and -multiple identical Invariant Sections may be replaced with a single -copy. If there are multiple Invariant Sections with the same name but -different contents, make the title of each such section unique by -adding at the end of it, in parentheses, the name of the original -author or publisher of that section if known, or else a unique number. -Make the same adjustment to the section titles in the list of -Invariant Sections in the license notice of the combined work.

+

+ If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to Preserve + its Title (section 1) will typically require changing the actual + title. +

-

In the combination, you must combine any sections entitled "History" -in the various original documents, forming one section entitled -"History"; likewise combine any sections entitled "Acknowledgements", -and any sections entitled "Dedications". You must delete all sections -entitled "Endorsements."

+

+ 9. TERMINATION +

-

6. Collections Of Documents

+

+ You may not copy, modify, sublicense, or distribute the Document except + as expressly provided for under this License. Any other attempt to + copy, modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. +

-

You may make a collection consisting of the Document and other documents -released under this License, and replace the individual copies of this -License in the various documents with a single copy that is included in -the collection, provided that you follow the rules of this License for -verbatim copying of each of the documents in all other respects.

+

+ 10. FUTURE REVISIONS OF THIS LICENSE +

-

You may extract a single document from such a collection, and distribute -it individually under this License, provided you insert a copy of this -License into the extracted document, and follow this License in all -other respects regarding verbatim copying of that document.

+

+ The Free Software Foundation may publish new, revised versions + of the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + http://www.gnu.org/copyleft/. +

-

7. Aggregation With Independent Works

+

+ Each version of the License is given a distinguishing version number. + If the Document specifies that a particular numbered version of this + License "or any later version" applies to it, you have the option of + following the terms and conditions either of that specified version or + of any later version that has been published (not as a draft) by the + Free Software Foundation. If the Document does not specify a version + number of this License, you may choose any version ever published (not + as a draft) by the Free Software Foundation. +

-

A compilation of the Document or its derivatives with other separate -and independent documents or works, in or on a volume of a storage or -distribution medium, does not as a whole count as a Modified Version -of the Document, provided no compilation copyright is claimed for the -compilation. Such a compilation is called an "aggregate", and this -License does not apply to the other self-contained works thus compiled -with the Document, on account of their being thus compiled, if they -are not themselves derivative works of the Document.

+

How to use this License for your documents

-

If the Cover Text requirement of section 3 is applicable to these -copies of the Document, then if the Document is less than one quarter -of the entire aggregate, the Document's Cover Texts may be placed on -covers that surround only the Document within the aggregate. -Otherwise they must appear on covers around the whole aggregate.

+

+ To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: +

-

8. Translation

+
+  Copyright (c)  YEAR  YOUR NAME.
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.2
+  or any later version published by the Free Software Foundation;
+  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+  Texts.  A copy of the license is included in the section entitled "GNU
+  Free Documentation License".
+
-

Translation is considered a kind of modification, so you may -distribute translations of the Document under the terms of section 4. -Replacing Invariant Sections with translations requires special -permission from their copyright holders, but you may include -translations of some or all Invariant Sections in addition to the -original versions of these Invariant Sections. You may include a -translation of this License provided that you also include the -original English version of this License. In case of a disagreement -between the translation and the original English version of this -License, the original English version will prevail.

+

+ If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, + replace the "with...Texts." line with this: +

-

9. Termination

+
+  with the Invariant Sections being LIST THEIR TITLES, with the
+  Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
-

You may not copy, modify, sublicense, or distribute the Document except -as expressly provided for under this License. Any other attempt to -copy, modify, sublicense or distribute the Document is void, and will -automatically terminate your rights under this License. However, -parties who have received copies, or rights, from you under this -License will not have their licenses terminated so long as such -parties remain in full compliance.

+

+ If you have Invariant Sections without Cover Texts, or some other + combination of the three, merge those two alternatives to suit the + situation. +

-

10. Future Revisions Of This License

- -

The Free Software Foundation may publish new, revised versions -of the GNU Free Documentation License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. See -http:///www.gnu.org/copyleft/.

- -

Each version of the License is given a distinguishing version number. -If the Document specifies that a particular numbered version of this -License "or any later version" applies to it, you have the option of -following the terms and conditions either of that specified version or -of any later version that has been published (not as a draft) by the -Free Software Foundation. If the Document does not specify a version -number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation.

+

+ If your document contains nontrivial examples of program code, we + recommend releasing these examples in parallel under your choice of + free software license, such as the GNU General Public License, + to permit their use in free software. +

diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/footer.html --- a/kdiff3/doc/en/common/footer.html Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/doc/en/common/footer.html Tue Jan 06 17:51:29 2009 +0000 @@ -1,14 +1,64 @@ + + + +
+
+
+ + +

Class Picker

+
+
+ +
-
-KDE Logo -
-
-This file is part of the documentation for $projectname $projectnumber. -
-
-Documentation copyright © 1996-2003 the KDE developers.
-Generated on $datetime by -doxygen $doxygenversion written by Dimitri van Heesch, © 1997-2001 -
+ + +
+
+
+
    + +
+ +
+
+
+ +
+ + + +
+ + + + + + + diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/gpl-license.html --- a/kdiff3/doc/en/common/gpl-license.html Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/doc/en/common/gpl-license.html Tue Jan 06 17:51:29 2009 +0000 @@ -16,7 +16,7 @@

Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

@@ -341,7 +341,7 @@ 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 + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

Also add information on how to contact you by electronic and paper mail.

diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/header.html --- a/kdiff3/doc/en/common/header.html Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/doc/en/common/header.html Tue Jan 06 17:51:29 2009 +0000 @@ -1,34 +1,67 @@ - - + + + + - - $title ($projectname) - + $title + + + + + + + + + + + + + + + + + -
- - - - - - -
- - -

$projectname API Documentation

-
- - - - - - - - - - -
OverviewClass HierarchyClassesClasses (annotated)MembersNamespacesSource Files
-
+ + + + + +
+ -
-
+ +
+
+ + +
+
+ + +
+ + +
+ + + diff -r 881e47f5076b -r fcd146072e0c kdiff3/doc/en/common/mainheader.html --- a/kdiff3/doc/en/common/mainheader.html Tue Jan 06 17:15:53 2009 +0000 +++ b/kdiff3/doc/en/common/mainheader.html Tue Jan 06 17:51:29 2009 +0000 @@ -1,29 +1,66 @@ - - + + + + - - $title ($projectname) - + $title + + + + + + + + + + + + + + + + + -
- - - - - - -
- - -

$projectname

-
- - - - - -
HomeSearch
-
+ + + + + +
+ -
-
+ +
+
+ +