Mercurial > hg > easyhg-kdiff3

changeset 85:5d4c32485a04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none)
author joachim99
date Tue, 06 Jan 2009 18:20:32 +0000
parents 6702ef39e787
children fd0f8012919f
files kdiff3/doc/en/background.png kdiff3/doc/en/common/headerbg.png kdiff3/doc/en/common/kde-localised.css.template kdiff3/doc/en/common/kde_gear_64.png kdiff3/doc/en/common/top-right-konqueror.png kdiff3/kdiff3.kdevelop kdiff3/po/createqm kdiff3/po/cvsgetpo kdiff3/src-QT4/Makefile.qt kdiff3/src-QT4/kdiff3_meta_unload.cpp kdiff3/src-QT4/kreplacements/diff.moc kdiff3/src-QT4/kreplacements/difftextwindow.moc kdiff3/src-QT4/kreplacements/directorymergewindow.moc kdiff3/src-QT4/kreplacements/fileaccess.moc kdiff3/src-QT4/kreplacements/kcolorbtn.h kdiff3/src-QT4/kreplacements/kdiff3.moc kdiff3/src-QT4/kreplacements/kdiff3_part.moc kdiff3/src-QT4/kreplacements/kdiff3_shell.moc kdiff3/src-QT4/kreplacements/kkeydialog.h kdiff3/src-QT4/kreplacements/kpopupmenu.h kdiff3/src-QT4/kreplacements/kreplacements.moc kdiff3/src-QT4/kreplacements/kstdaction.h kdiff3/src-QT4/kreplacements/ktempfile.h kdiff3/src-QT4/kreplacements/kurldrag.h kdiff3/src-QT4/kreplacements/mergeresultwindow.moc kdiff3/src-QT4/kreplacements/optiondialog.moc kdiff3/src-QT4/kreplacements/smalldialogs.moc
diffstat 16 files changed, 0 insertions(+), 673 deletions(-) [+]
line wrap: on
line diff
Binary file kdiff3/doc/en/background.png has changed
Binary file kdiff3/doc/en/common/headerbg.png has changed
--- a/kdiff3/doc/en/common/kde-localised.css.template	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-    KDE CSS for <**languagecountry**> HTML documentation (all media types).
-    Copyright (C) 2000 <**authorname**>
-
-    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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Send comments, suggestions, etc. to <**authorcontactdetails**>.
-*/
-
-/*
-   These settings will override kde-default.css.
-
-   Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/
-
-   Check out http://www.richinstyle.com/ where many of the declarations and
-   setup in the KDE CSS are obtained from.  In fact, do not change anything 
-   without checking so on those pages whether it is wise to do.
-*/
-
-:lg(**language**) { }
Binary file kdiff3/doc/en/common/kde_gear_64.png has changed
Binary file kdiff3/doc/en/common/top-right-konqueror.png has changed
--- a/kdiff3/kdiff3.kdevelop	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Joachim Eibl</author>
-    <email>joachim dot eibl at gmx dot de</email>
-    <version>0.9.92</version>
-    <projectmanagement>KDevKDEAutoProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>C++</keyword>
-      <keyword>Code</keyword>
-      <keyword>Qt</keyword>
-      <keyword>KDE</keyword>
-    </keywords>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <ignoreparts/>
-    <secondaryLanguages/>
-  </general>
-  <kdevautoproject>
-    <general>
-      <activetarget>src/kdiff3</activetarget>
-      <useconfiguration>debug</useconfiguration>
-    </general>
-    <run>
-      <mainprogram>/daten/home/joachim/kdiff3-0.9.92a/debug/src/kdiff3</mainprogram>
-      <directoryradio>custom</directoryradio>
-      <customdirectory>/daten/home/joachim/kdiff3_testdir/</customdirectory>
-      <programargs/>
-      <terminal>true</terminal>
-      <autocompile>true</autocompile>
-      <envvars>
-        <envvar value="/home/joachim/kdiff3-0.9.92a/debug/src/.libs/libkdiff3part.so" name="LD_PRELOAD" />
-      </envvars>
-    </run>
-    <configurations>
-      <optimized>
-        <builddir>optimized</builddir>
-        <ccompiler>GccOptions</ccompiler>
-        <cxxcompiler>GppOptions</cxxcompiler>
-        <f77compiler>G77Options</f77compiler>
-        <cxxflags>-O2 -g0</cxxflags>
-      </optimized>
-      <debug>
-        <configargs>--enable-debug=full --prefix=/opt/kde3</configargs>
-        <builddir>debug</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
-        <cxxflags>-O0</cxxflags>
-        <topsourcedir/>
-        <cppflags/>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cflags/>
-        <f77flags/>
-        <envvars/>
-      </debug>
-    </configurations>
-    <make>
-      <envvars>
-        <envvar value="1" name="WANT_AUTOCONF_2_5" />
-        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-      </envvars>
-      <abortonerror>true</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-      <runmultiplejobs>false</runmultiplejobs>
-    </make>
-  </kdevautoproject>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*.po;*.ts" name="Translations" />
-      <group pattern="*" name="Others" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns></hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <showvcsfields>true</showvcsfields>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>gtk</toc>
-      <toc>gnustep</toc>
-      <toc>python</toc>
-      <toc>php</toc>
-      <toc>perl</toc>
-    </ignoretocs>
-    <projectdoc>
-      <userdocDir>doc/en/</userdocDir>
-      <apidocDir>debug/</apidocDir>
-    </projectdoc>
-    <ignoreqt_xml/>
-    <ignoredoxygen/>
-    <ignorekdocs/>
-    <ignoredevhelp/>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell>libtool</dbgshell>
-      <programargs/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
-    <cvsoptions>-f</cvsoptions>
-    <commitoptions/>
-    <addoptions/>
-    <logoptions/>
-    <updateoptions>-dP</updateoptions>
-    <removeoptions>-f</removeoptions>
-    <revertoptions>-C -d -P</revertoptions>
-    <diffoptions>-u3 -p</diffoptions>
-    <rshoptions/>
-  </kdevcvs>
-  <kdevcppsupport>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-    <references/>
-    <creategettersetter>
-      <prefixGet/>
-      <prefixSet>set</prefixSet>
-      <prefixVariable>m_,_</prefixVariable>
-      <parameterName>theValue</parameterName>
-      <inlineGet>true</inlineGet>
-      <inlineSet>true</inlineSet>
-    </creategettersetter>
-    <qt>
-      <used>true</used>
-      <version>3</version>
-      <root>/usr/lib/qt3</root>
-    </qt>
-  </kdevcppsupport>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem/>
-      <docurl/>
-      <usermanualurl/>
-    </projectdoc>
-  </kdevdocumentation>
-  <ctagspart>
-    <customArguments/>
-    <customTagfilePath/>
-  </ctagspart>
-</kdevelop>
--- a/kdiff3/po/createqm	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-for i in `cat subdirs` ; do
-   if [ -a $i.po ]; then 
-      echo $i
-      msgmerge --no-fuzzy-matching kdelibspo/kdelibs_$i.po kreplacements.pot >kreplacements_$i.po
-      msgcat --use-first $i.po kreplacements_$i.po >kdiff3_$i.po
-      /usr/lib/qt3/bin/msg2qm kdiff3_$i.po kdiff3_$i.qm
-      rm kdiff3_$i.po kreplacements_$i.po
-   fi
-done
--- a/kdiff3/po/cvsgetpo	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-cvs co kde-i18n/subdirs
-for i in `cat kde-i18n/subdirs`; do  cvs co kde-i18n/$i/messages/kdeextragear-1/kdiff3.po; done
-for i in `cat kde-i18n/subdirs`; do  cp -p kde-i18n/$i/messages/kdeextragear-1/kdiff3.po $i.po; done
--- a/kdiff3/src-QT4/Makefile.qt	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,425 +0,0 @@
-#############################################################################
-# Makefile for building: kdiff3
-# Generated by qmake (1.07a) (Qt 3.3.5) on: Sat Apr  8 20:11:51 2006
-# Project:  kdiff3.pro
-# Template: app
-# Command: $(QMAKE) -o Makefile kdiff3.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -O2 -Wall -W -fPIC -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
-CXXFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I$(QTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(QTDIR)/include
-LINK     = g++
-LFLAGS   = 
-LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-INSTALL_FILE= $(COPY_FILE)
-INSTALL_DIR = $(COPY_DIR)
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = ./
-
-####### Files
-
-HEADERS = version.h \
-		diff.h \
-		difftextwindow.h \
-		mergeresultwindow.h \
-		kdiff3.h \
-		merger.h \
-		optiondialog.h \
-		kreplacements/kreplacements.h \
-		directorymergewindow.h \
-		fileaccess.h \
-		kdiff3_shell.h \
-		kdiff3_part.h \
-		smalldialogs.h
-SOURCES = main.cpp \
-		diff.cpp \
-		difftextwindow.cpp \
-		kdiff3.cpp \
-		merger.cpp \
-		mergeresultwindow.cpp \
-		optiondialog.cpp \
-		pdiff.cpp \
-		directorymergewindow.cpp \
-		fileaccess.cpp \
-		smalldialogs.cpp \
-		kdiff3_shell.cpp \
-		kdiff3_part.cpp \
-		gnudiff_analyze.cpp \
-		gnudiff_io.cpp \
-		gnudiff_xmalloc.cpp \
-		common.cpp \
-		kreplacements/kreplacements.cpp \
-		kreplacements/ShellContextMenu.cpp
-OBJECTS = main.o \
-		diff.o \
-		difftextwindow.o \
-		kdiff3.o \
-		merger.o \
-		mergeresultwindow.o \
-		optiondialog.o \
-		pdiff.o \
-		directorymergewindow.o \
-		fileaccess.o \
-		smalldialogs.o \
-		kdiff3_shell.o \
-		kdiff3_part.o \
-		gnudiff_analyze.o \
-		gnudiff_io.o \
-		gnudiff_xmalloc.o \
-		common.o \
-		kreplacements.o \
-		ShellContextMenu.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = moc_difftextwindow.cpp \
-		moc_mergeresultwindow.cpp \
-		moc_kdiff3.cpp \
-		moc_optiondialog.cpp \
-		kreplacements/moc_kreplacements.cpp \
-		moc_directorymergewindow.cpp \
-		moc_fileaccess.cpp \
-		moc_kdiff3_shell.cpp \
-		moc_kdiff3_part.cpp \
-		moc_smalldialogs.cpp
-OBJMOC = moc_difftextwindow.o \
-		moc_mergeresultwindow.o \
-		moc_kdiff3.o \
-		moc_optiondialog.o \
-		moc_kreplacements.o \
-		moc_directorymergewindow.o \
-		moc_fileaccess.o \
-		moc_kdiff3_shell.o \
-		moc_kdiff3_part.o \
-		moc_smalldialogs.o
-DIST	   = kdiff3.pro
-QMAKE_TARGET = kdiff3
-DESTDIR  = 
-TARGET   = kdiff3
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: $(TARGET)
-
-$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc && $(MAKE) )
-
-dist: 
-	@mkdir -p .tmp/kdiff3 && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/kdiff3/ && ( cd `dirname .tmp/kdiff3` && $(TAR) kdiff3.tar kdiff3 && $(GZIP) kdiff3.tar ) && $(MOVE) `dirname .tmp/kdiff3`/kdiff3.tar.gz . && $(DEL_FILE) -r .tmp/kdiff3
-
-mocclean:
-	-$(DEL_FILE) $(OBJMOC)
-	-$(DEL_FILE) $(SRCMOC)
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean: mocclean
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(TARGET) $(TARGET)
-
-
-FORCE:
-
-####### Compile
-
-main.o: main.cpp kdiff3_shell.h \
-		version.h \
-		optiondialog.h \
-		common.h
-
-diff.o: diff.cpp diff.h \
-		fileaccess.h \
-		optiondialog.h \
-		common.h
-
-difftextwindow.o: difftextwindow.cpp difftextwindow.h \
-		merger.h \
-		optiondialog.h \
-		diff.h \
-		common.h \
-		fileaccess.h
-
-kdiff3.o: kdiff3.cpp difftextwindow.h \
-		mergeresultwindow.h \
-		kdiff3.h \
-		optiondialog.h \
-		fileaccess.h \
-		kdiff3_part.h \
-		directorymergewindow.h \
-		smalldialogs.h \
-		xpm/downend.xpm \
-		xpm/currentpos.xpm \
-		xpm/down1arrow.xpm \
-		xpm/down2arrow.xpm \
-		xpm/upend.xpm \
-		xpm/up1arrow.xpm \
-		xpm/up2arrow.xpm \
-		xpm/prevunsolved.xpm \
-		xpm/nextunsolved.xpm \
-		xpm/iconA.xpm \
-		xpm/iconB.xpm \
-		xpm/iconC.xpm \
-		xpm/autoadvance.xpm \
-		xpm/showwhitespace.xpm \
-		xpm/showwhitespacechars.xpm \
-		xpm/showlinenumbers.xpm \
-		diff.h \
-		common.h
-
-merger.o: merger.cpp merger.h \
-		diff.h \
-		common.h \
-		fileaccess.h \
-		optiondialog.h
-
-mergeresultwindow.o: mergeresultwindow.cpp mergeresultwindow.h \
-		optiondialog.h \
-		diff.h \
-		common.h \
-		fileaccess.h
-
-optiondialog.o: optiondialog.cpp optiondialog.h \
-		diff.h \
-		smalldialogs.h \
-		common.h \
-		fileaccess.h
-
-pdiff.o: pdiff.cpp difftextwindow.h \
-		mergeresultwindow.h \
-		directorymergewindow.h \
-		smalldialogs.h \
-		kdiff3.h \
-		optiondialog.h \
-		fileaccess.h \
-		gnudiff_diff.h \
-		diff.h \
-		common.h \
-		gnudiff_system.h
-
-directorymergewindow.o: directorymergewindow.cpp directorymergewindow.h \
-		optiondialog.h \
-		xpm/link_arrow.xpm \
-		xpm/file.xpm \
-		xpm/folder.xpm \
-		xpm/startmerge.xpm \
-		xpm/showequalfiles.xpm \
-		xpm/showfilesonlyina.xpm \
-		xpm/showfilesonlyinb.xpm \
-		xpm/showfilesonlyinc.xpm \
-		common.h \
-		fileaccess.h \
-		diff.h
-
-fileaccess.o: fileaccess.cpp fileaccess.h \
-		optiondialog.h \
-		common.h
-
-smalldialogs.o: smalldialogs.cpp smalldialogs.h \
-		optiondialog.h \
-		diff.h \
-		common.h \
-		fileaccess.h
-
-kdiff3_shell.o: kdiff3_shell.cpp kdiff3_shell.h \
-		kdiff3.h \
-		diff.h \
-		common.h \
-		fileaccess.h \
-		optiondialog.h
-
-kdiff3_part.o: kdiff3_part.cpp kdiff3_part.h \
-		kdiff3.h \
-		fileaccess.h \
-		version.h \
-		diff.h \
-		common.h \
-		optiondialog.h
-
-gnudiff_analyze.o: gnudiff_analyze.cpp gnudiff_diff.h \
-		gnudiff_system.h
-
-gnudiff_io.o: gnudiff_io.cpp gnudiff_diff.h \
-		gnudiff_system.h
-
-gnudiff_xmalloc.o: gnudiff_xmalloc.cpp gnudiff_diff.h \
-		gnudiff_system.h
-
-common.o: common.cpp common.h
-
-kreplacements.o: kreplacements/kreplacements.cpp kreplacements/kreplacements.h \
-		common.h \
-		xpm/fileopen.xpm \
-		xpm/filesave.xpm \
-		xpm/fileprint.xpm \
-		kreplacements/kreplacements.moc
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o kreplacements.o kreplacements/kreplacements.cpp
-
-ShellContextMenu.o: kreplacements/ShellContextMenu.cpp kreplacements/ShellContextMenu.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ShellContextMenu.o kreplacements/ShellContextMenu.cpp
-
-moc_difftextwindow.o: moc_difftextwindow.cpp  difftextwindow.h diff.h \
-		common.h \
-		fileaccess.h \
-		optiondialog.h
-
-moc_mergeresultwindow.o: moc_mergeresultwindow.cpp  mergeresultwindow.h diff.h \
-		common.h \
-		fileaccess.h \
-		optiondialog.h
-
-moc_kdiff3.o: moc_kdiff3.cpp  kdiff3.h diff.h \
-		common.h \
-		fileaccess.h \
-		optiondialog.h
-
-moc_optiondialog.o: moc_optiondialog.cpp  optiondialog.h 
-
-moc_kreplacements.o: kreplacements/moc_kreplacements.cpp  kreplacements/kreplacements.h common.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_kreplacements.o kreplacements/moc_kreplacements.cpp
-
-moc_directorymergewindow.o: moc_directorymergewindow.cpp  directorymergewindow.h common.h \
-		fileaccess.h \
-		diff.h \
-		optiondialog.h
-
-moc_fileaccess.o: moc_fileaccess.cpp  fileaccess.h 
-
-moc_kdiff3_shell.o: moc_kdiff3_shell.cpp  kdiff3_shell.h 
-
-moc_kdiff3_part.o: moc_kdiff3_part.cpp  kdiff3_part.h 
-
-moc_smalldialogs.o: moc_smalldialogs.cpp  smalldialogs.h diff.h \
-		common.h \
-		fileaccess.h \
-		optiondialog.h
-
-moc_difftextwindow.cpp: $(MOC) difftextwindow.h
-	$(MOC) difftextwindow.h -o moc_difftextwindow.cpp
-
-moc_mergeresultwindow.cpp: $(MOC) mergeresultwindow.h
-	$(MOC) mergeresultwindow.h -o moc_mergeresultwindow.cpp
-
-moc_kdiff3.cpp: $(MOC) kdiff3.h
-	$(MOC) kdiff3.h -o moc_kdiff3.cpp
-
-moc_optiondialog.cpp: $(MOC) optiondialog.h
-	$(MOC) optiondialog.h -o moc_optiondialog.cpp
-
-kreplacements/moc_kreplacements.cpp: $(MOC) kreplacements/kreplacements.h
-	$(MOC) kreplacements/kreplacements.h -o kreplacements/moc_kreplacements.cpp
-
-moc_directorymergewindow.cpp: $(MOC) directorymergewindow.h
-	$(MOC) directorymergewindow.h -o moc_directorymergewindow.cpp
-
-moc_fileaccess.cpp: $(MOC) fileaccess.h
-	$(MOC) fileaccess.h -o moc_fileaccess.cpp
-
-moc_kdiff3_shell.cpp: $(MOC) kdiff3_shell.h
-	$(MOC) kdiff3_shell.h -o moc_kdiff3_shell.cpp
-
-moc_kdiff3_part.cpp: $(MOC) kdiff3_part.h
-	$(MOC) kdiff3_part.h -o moc_kdiff3_part.cpp
-
-moc_smalldialogs.cpp: $(MOC) smalldialogs.h
-	$(MOC) smalldialogs.h -o moc_smalldialogs.cpp
-
-####### Install
-
-install_documentation: all 
-	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/da" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/de" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/en" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/et" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/fr" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/it" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/pt" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-	-$(INSTALL_DIR) "../doc/sv" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-
-
-uninstall_documentation: 
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/da"
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/de"
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/en"
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/et"
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/fr"
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/it"
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/pt"
-	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/sv"
-	-$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-
-
-install_target: all 
-	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/bin/"
-	-$(INSTALL_FILE) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-
-uninstall_target: 
-	-$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-	-$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/bin/"
-
-
-install: install_documentation install_target  
-
-uninstall: uninstall_documentation uninstall_target  
-
--- a/kdiff3/src-QT4/kdiff3_meta_unload.cpp	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
--- a/kdiff3/src-QT4/kreplacements/kcolorbtn.h	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
--- a/kdiff3/src-QT4/kreplacements/kkeydialog.h	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
--- a/kdiff3/src-QT4/kreplacements/kpopupmenu.h	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
--- a/kdiff3/src-QT4/kreplacements/kstdaction.h	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
--- a/kdiff3/src-QT4/kreplacements/ktempfile.h	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
--- a/kdiff3/src-QT4/kreplacements/kurldrag.h	Tue Jan 06 18:13:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
-