Branch: null

76718abd 2010-02-09 19:27:27 tpearson
Added abandoned KDE3 version of kdiff3


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
A AUTHORS
A COPYING
A ChangeLog
A Doxyfile
A INSTALL
A Makefile.am
A Makefile.cvs
A NEWS
A README
A TODO
A acinclude.m4
A aclocal.m4
A config.guess
A config.h.in
A config.log
A config.sub
A configure.files
A configure.in
A configure.in.in
A diff_ext_for_kdiff3/.depend
A diff_ext_for_kdiff3/LICENSE
A diff_ext_for_kdiff3/Makefile
A diff_ext_for_kdiff3/README
A diff_ext_for_kdiff3/class_factory.cpp
A diff_ext_for_kdiff3/class_factory.h
A diff_ext_for_kdiff3/diff_ext.cpp
A diff_ext_for_kdiff3/diff_ext.h
A diff_ext_for_kdiff3/diff_ext.pot
A diff_ext_for_kdiff3/diff_ext_de.po
A diff_ext_for_kdiff3/diff_ext_for_kdiff3.def
A diff_ext_for_kdiff3/diff_ext_for_kdiff3.exp
A diff_ext_for_kdiff3/diff_ext_for_kdiff3.rc
A diff_ext_for_kdiff3/diff_ext_for_kdiff3.vcproj
A diff_ext_for_kdiff3/diff_ext_for_kdiff3_msvc.def
A diff_ext_for_kdiff3/diffextstring.h
A diff_ext_for_kdiff3/server.cpp
A diff_ext_for_kdiff3/server.h
A doc/Makefile.am
A doc/README
A doc/createpdfdoc
A doc/da/Makefile.am
A doc/da/dirbrowser.png
A doc/da/dirmergebig.png
A doc/da/index.docbook
A doc/da/iteminfo.png
A doc/da/letter_by_letter.png
A doc/da/merge_current.png
A doc/da/new.png
A doc/da/open_dialog.png
A doc/da/screenshot_diff.png
A doc/da/screenshot_merge.png
A doc/da/triple_diff.png
A doc/da/white_space.png
A doc/de/Makefile.am
A doc/de/dirbrowser.png
A doc/de/dirmergebig.png
A doc/de/index.docbook
A doc/de/iteminfo.png
A doc/de/letter_by_letter.png
A doc/de/merge_current.png
A doc/de/new.png
A doc/de/open_dialog.png
A doc/de/screenshot_diff.png
A doc/de/screenshot_merge.png
A doc/de/triple_diff.png
A doc/de/white_space.png
A doc/en/Makefile.am
A doc/en/common/appheader.html
A doc/en/common/artistic-license.html
A doc/en/common/bottom-left.png
A doc/en/common/bottom-middle.png
A doc/en/common/bottom-right.png
A doc/en/common/fdl-license.html
A doc/en/common/fdl-notice.html
A doc/en/common/footer.html
A doc/en/common/gpl-license.html
A doc/en/common/header.html
A doc/en/common/headerbg.png
A doc/en/common/kde-default.css
A doc/en/common/kde-localised.css.template
A doc/en/common/kde_gear_64.png
A doc/en/common/kde_logo_bg.png
A doc/en/common/mainfooter.html
A doc/en/common/mainheader.html
A doc/en/common/top-left.png
A doc/en/common/top-middle.png
A doc/en/common/top-right-konqueror.png
A doc/en/compilation.html
A doc/en/credits.html
A doc/en/dirbrowser.png
A doc/en/dirmerge.html
A doc/en/dirmergebig.png
A doc/en/dirmergeoptions.html
A doc/en/dirmergevisible.html
A doc/en/documentation.html
A doc/en/dothemerge.html
A doc/en/faq.html
A doc/en/features.html
A doc/en/find.html
A doc/en/index.docbook
A doc/en/index.html
A doc/en/installation.html
A doc/en/interpretinginformation.html
A doc/en/introduction.html
A doc/en/iteminfo.png
A doc/en/kdiff3.1
A doc/en/kpart.html
A doc/en/letter_by_letter.png
A doc/en/merge_current.png
A doc/en/merging.html
A doc/en/misc.html
A doc/en/navigation.html
A doc/en/new.png
A doc/en/open_dialog.png
A doc/en/opendialog.html
A doc/en/options.html
A doc/en/other.html
A doc/en/pasteinput.html
A doc/en/preprocessors.html
A doc/en/printing.html
A doc/en/requirements.html
A doc/en/saving.html
A doc/en/screenshot_diff.png
A doc/en/screenshot_merge.png
A doc/en/screenshots.html
A doc/en/selections.html
A doc/en/startingdirmerge.html
A doc/en/triple_diff.png
A doc/en/white_space.png
A doc/es/Makefile.am
A doc/es/dirbrowser.png
A doc/es/dirmergebig.png
A doc/es/index.docbook
A doc/es/iteminfo.png
A doc/es/letter_by_letter.png
A doc/es/merge_current.png
A doc/es/new.png
A doc/es/open_dialog.png
A doc/es/screenshot_diff.png
A doc/es/screenshot_merge.png
A doc/es/triple_diff.png
A doc/es/white_space.png
A doc/et/Makefile.am
A doc/et/dirbrowser.png
A doc/et/dirmergebig.png
A doc/et/index.docbook
A doc/et/iteminfo.png
A doc/et/letter_by_letter.png
A doc/et/merge_current.png
A doc/et/new.png
A doc/et/open_dialog.png
A doc/et/screenshot_diff.png
A doc/et/screenshot_merge.png
A doc/et/triple_diff.png
A doc/et/white_space.png
A doc/fr/Makefile.am
A doc/fr/dirbrowser.png
A doc/fr/dirmergebig.png
A doc/fr/index.docbook
A doc/fr/iteminfo.png
A doc/fr/letter_by_letter.png
A doc/fr/merge_current.png
A doc/fr/new.png
A doc/fr/open_dialog.png
A doc/fr/screenshot_diff.png
A doc/fr/screenshot_merge.png
A doc/fr/triple_diff.png
A doc/fr/white_space.png
A doc/it/Makefile.am
A doc/it/dirbrowser.png
A doc/it/dirmergebig.png
A doc/it/index.docbook
A doc/it/iteminfo.png
A doc/it/letter_by_letter.png
A doc/it/merge_current.png
A doc/it/new.png
A doc/it/open_dialog.png
A doc/it/screenshot_diff.png
A doc/it/screenshot_merge.png
A doc/it/triple_diff.png
A doc/it/white_space.png
A doc/nl/Makefile.am
A doc/nl/dirbrowser.png
A doc/nl/dirmergebig.png
A doc/nl/index.docbook
A doc/nl/iteminfo.png
A doc/nl/letter_by_letter.png
A doc/nl/merge_current.png
A doc/nl/new.png
A doc/nl/open_dialog.png
A doc/nl/screenshot_diff.png
A doc/nl/screenshot_merge.png
A doc/nl/triple_diff.png
A doc/nl/white_space.png
A doc/pt/Makefile.am
A doc/pt/dirbrowser.png
A doc/pt/dirmergebig.png
A doc/pt/index.docbook
A doc/pt/iteminfo.png
A doc/pt/letter_by_letter.png
A doc/pt/merge_current.png
A doc/pt/new.png
A doc/pt/open_dialog.png
A doc/pt/screenshot_diff.png
A doc/pt/screenshot_merge.png
A doc/pt/triple_diff.png
A doc/pt/white_space.png
A doc/sv/Makefile.am
A doc/sv/dirbrowser.png
A doc/sv/dirmergebig.png
A doc/sv/index.docbook
A doc/sv/iteminfo.png
A doc/sv/letter_by_letter.png
A doc/sv/merge_current.png
A doc/sv/new.png
A doc/sv/open_dialog.png
A doc/sv/screenshot_diff.png
A doc/sv/screenshot_merge.png
A doc/sv/triple_diff.png
A doc/sv/white_space.png
A kdiff3.kdevelop
A kdiff3.spec
A kdiff3plugin/Makefile.am
A kdiff3plugin/kdiff3_plugin.desktop
A kdiff3plugin/kdiff3plugin.cpp
A kdiff3plugin/kdiff3plugin.desktop
A kdiff3plugin/kdiff3plugin.h
A kdiff3plugin/po/Makefile
A kdiff3plugin/po/Makefile.am
A kdiff3plugin/po/bg.po
A kdiff3plugin/po/br.po
A kdiff3plugin/po/cs.po
A kdiff3plugin/po/da.po
A kdiff3plugin/po/de.po
A kdiff3plugin/po/el.po
A kdiff3plugin/po/et.po
A kdiff3plugin/po/ga.po
A kdiff3plugin/po/it.po
A kdiff3plugin/po/nl.po
A kdiff3plugin/po/pt.po
A kdiff3plugin/po/pt_BR.po
A kdiff3plugin/po/sk.po
A kdiff3plugin/po/sv.po
A kdiff3plugin/po/tr.po
A po/Makefile.am
A po/README
A po/ar.po
A po/az.po
A po/bg.po
A po/br.po
A po/ca.po
A po/createqm
A po/cs.po
A po/cvsgetpo
A po/cy.po
A po/da.po
A po/de.po
A po/el.po
A po/en_GB.po
A po/es.po
A po/et.po
A po/fr.po
A po/ga.po
A po/gl.po
A po/hi.po
A po/hu.po
A po/is.po
A po/it.po
A po/ja.po
A po/ka.po
A po/kdiff3.pot
A po/lt.po
A po/nb.po
A po/nl.po
A po/pl.po
A po/pt.po
A po/pt_BR.po
A po/ro.po
A po/ru.po
A po/rw.po
A po/sk.po
A po/sr.po
A po/sr@...
A po/sv.po
A po/ta.po
A po/tg.po
A po/tr.po
A po/uk.po
A po/zh_CN.po
A src/Makefile.am
A src/Makefile.qt
A src/ccInstHelper.cpp
A src/common.cpp
A src/common.h
A src/diff.cpp
A src/diff.h
A src/difftextwindow.cpp
A src/difftextwindow.h
A src/directorymergewindow.cpp
A src/directorymergewindow.h
A src/fileaccess.cpp
A src/fileaccess.h
A src/gnudiff_analyze.cpp
A src/gnudiff_diff.h
A src/gnudiff_io.cpp
A src/gnudiff_system.h
A src/gnudiff_xmalloc.cpp
A src/hi16-app-kdiff3.png
A src/hi32-app-kdiff3.png
A src/kdiff3.cpp
A src/kdiff3.desktop
A src/kdiff3.h
A src/kdiff3.ico
A src/kdiff3.lsm
A src/kdiff3.pro
A src/kdiff3.rc
A src/kdiff3_meta_unload.cpp
A src/kdiff3_part.cpp
A src/kdiff3_part.h
A src/kdiff3_part.rc
A src/kdiff3_shell.cpp
A src/kdiff3_shell.h
A src/kdiff3_shell.rc
A src/kdiff3part.desktop
A src/kreplacements/README
A src/kreplacements/ShellContextMenu.cpp
A src/kreplacements/ShellContextMenu.h
A src/kreplacements/kaboutdata.h
A src/kreplacements/kaccel.h
A src/kreplacements/kaction.h
A src/kreplacements/kapplication.h
A src/kreplacements/kcmdlineargs.h
A src/kreplacements/kcolorbtn.h
A src/kreplacements/kconfig.h
A src/kreplacements/kdialogbase.h
A src/kreplacements/kedittoolbar.h
A src/kreplacements/kfiledialog.h
A src/kreplacements/kfontdialog.h
A src/kreplacements/kiconloader.h
A src/kreplacements/kinstance.h
A src/kreplacements/kio/global.h
A src/kreplacements/kio/job.h
A src/kreplacements/kio/jobclasses.h
A src/kreplacements/kkeydialog.h
A src/kreplacements/klibloader.h
A src/kreplacements/klocale.h
A src/kreplacements/kmainwindow.h
A src/kreplacements/kmenubar.h
A src/kreplacements/kmessagebox.h
A src/kreplacements/konq_popupmenu.h
A src/kreplacements/kparts/factory.h
A src/kreplacements/kparts/mainwindow.h
A src/kreplacements/kparts/part.h
A src/kreplacements/kpopupmenu.h
A src/kreplacements/kprinter.h
A src/kreplacements/kprogress.h
A src/kreplacements/kreplacements.cpp
A src/kreplacements/kreplacements.h
A src/kreplacements/kstandarddirs.h
A src/kreplacements/kstatusbar.h
A src/kreplacements/kstdaction.h
A src/kreplacements/ktempfile.h
A src/kreplacements/kunload.h
A src/kreplacements/kurl.h
A src/kreplacements/kurldrag.h
A src/lo16-app-kdiff3.png
A src/lo32-app-kdiff3.png
A src/main.cpp
A src/merger.cpp
A src/merger.h
A src/mergeresultwindow.cpp
A src/mergeresultwindow.h
A src/optiondialog.cpp
A src/optiondialog.h
A src/pdiff.cpp
A src/smalldialogs.cpp
A src/smalldialogs.h
A src/version.h
A src/xpm/autoadvance.xpm
A src/xpm/currentpos.xpm
A src/xpm/down1arrow.xpm
A src/xpm/down2arrow.xpm
A src/xpm/downend.xpm
A src/xpm/file.xpm
A src/xpm/filenew.xpm
A src/xpm/fileopen.xpm
A src/xpm/fileprint.xpm
A src/xpm/filesave.xpm
A src/xpm/folder.xpm
A src/xpm/iconA.xpm
A src/xpm/iconB.xpm
A src/xpm/iconC.xpm
A src/xpm/link_arrow.xpm
A src/xpm/nextunsolved.xpm
A src/xpm/prevunsolved.xpm
A src/xpm/reload.xpm
A src/xpm/showequalfiles.xpm
A src/xpm/showfilesonlyina.xpm
A src/xpm/showfilesonlyinb.xpm
A src/xpm/showfilesonlyinc.xpm
A src/xpm/showlinenumbers.xpm
A src/xpm/showwhitespace.xpm
A src/xpm/showwhitespacechars.xpm
A src/xpm/startmerge.xpm
A src/xpm/up1arrow.xpm
A src/xpm/up2arrow.xpm
A src/xpm/upend.xpm
A stamp-h.in
A subdirs
A templates/cpp
A templates/h
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e4781f1
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Joachim Eibl <joachim.eibl@...>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..f3551af
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+               51 Franklin Steet, 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.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
 ** Diff limit reached (max: 250 lines) **
63862fdf 2010-03-23 19:04:13 tpearson
Fixed images


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1106830 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M doc/da/dirbrowser.png
M doc/da/dirmergebig.png
M doc/da/iteminfo.png
M doc/da/letter_by_letter.png
M doc/da/merge_current.png
M doc/da/new.png
M doc/da/open_dialog.png
M doc/da/screenshot_diff.png
M doc/da/screenshot_merge.png
M doc/da/triple_diff.png
M doc/da/white_space.png
M doc/de/dirbrowser.png
M doc/de/dirmergebig.png
M doc/de/iteminfo.png
M doc/de/letter_by_letter.png
M doc/de/merge_current.png
M doc/de/new.png
M doc/de/open_dialog.png
M doc/de/screenshot_diff.png
M doc/de/screenshot_merge.png
M doc/de/triple_diff.png
M doc/de/white_space.png
M doc/en/common/bottom-left.png
M doc/en/common/bottom-middle.png
M doc/en/common/bottom-right.png
M doc/en/common/headerbg.png
M doc/en/common/kde_gear_64.png
M doc/en/common/kde_logo_bg.png
M doc/en/common/top-left.png
M doc/en/common/top-middle.png
M doc/en/common/top-right-konqueror.png
M doc/en/dirbrowser.png
M doc/en/dirmergebig.png
M doc/en/iteminfo.png
M doc/en/letter_by_letter.png
M doc/en/merge_current.png
M doc/en/new.png
M doc/en/open_dialog.png
M doc/en/screenshot_diff.png
M doc/en/screenshot_merge.png
M doc/en/triple_diff.png
M doc/en/white_space.png
M doc/es/dirbrowser.png
M doc/es/dirmergebig.png
M doc/es/iteminfo.png
M doc/es/letter_by_letter.png
M doc/es/merge_current.png
M doc/es/new.png
M doc/es/open_dialog.png
M doc/es/screenshot_diff.png
M doc/es/screenshot_merge.png
M doc/es/triple_diff.png
M doc/es/white_space.png
M doc/et/dirbrowser.png
M doc/et/dirmergebig.png
M doc/et/iteminfo.png
M doc/et/letter_by_letter.png
M doc/et/merge_current.png
M doc/et/new.png
M doc/et/open_dialog.png
M doc/et/screenshot_diff.png
M doc/et/screenshot_merge.png
M doc/et/triple_diff.png
M doc/et/white_space.png
M doc/fr/dirbrowser.png
M doc/fr/dirmergebig.png
M doc/fr/iteminfo.png
M doc/fr/letter_by_letter.png
M doc/fr/merge_current.png
M doc/fr/new.png
M doc/fr/open_dialog.png
M doc/fr/screenshot_diff.png
M doc/fr/screenshot_merge.png
M doc/fr/triple_diff.png
M doc/fr/white_space.png
M doc/it/dirbrowser.png
M doc/it/dirmergebig.png
M doc/it/iteminfo.png
M doc/it/letter_by_letter.png
M doc/it/merge_current.png
M doc/it/new.png
M doc/it/open_dialog.png
M doc/it/screenshot_diff.png
M doc/it/screenshot_merge.png
M doc/it/triple_diff.png
M doc/it/white_space.png
M doc/nl/dirbrowser.png
M doc/nl/dirmergebig.png
M doc/nl/iteminfo.png
M doc/nl/letter_by_letter.png
M doc/nl/merge_current.png
M doc/nl/new.png
M doc/nl/open_dialog.png
M doc/nl/screenshot_diff.png
M doc/nl/screenshot_merge.png
M doc/nl/triple_diff.png
M doc/nl/white_space.png
M doc/pt/dirbrowser.png
M doc/pt/dirmergebig.png
M doc/pt/iteminfo.png
M doc/pt/letter_by_letter.png
M doc/pt/merge_current.png
M doc/pt/new.png
M doc/pt/open_dialog.png
M doc/pt/screenshot_diff.png
M doc/pt/screenshot_merge.png
M doc/pt/triple_diff.png
M doc/pt/white_space.png
M doc/sv/dirbrowser.png
M doc/sv/dirmergebig.png
M doc/sv/iteminfo.png
M doc/sv/letter_by_letter.png
M doc/sv/merge_current.png
M doc/sv/new.png
M doc/sv/open_dialog.png
M doc/sv/screenshot_diff.png
M doc/sv/screenshot_merge.png
M doc/sv/triple_diff.png
M doc/sv/white_space.png
M src/hi16-app-kdiff3.png
M src/hi32-app-kdiff3.png
M src/lo16-app-kdiff3.png
M src/lo32-app-kdiff3.png
 ** Diff limit reached (max: 250 lines) **
f636ba5b 2011-06-27 00:58:16 tpearson
TQt4 port kdiff3
This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1238464 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M diff_ext_for_kdiff3/diff_ext.cpp
M diff_ext_for_kdiff3/diffextstring.h
M kdiff3plugin/Makefile.am
M kdiff3plugin/kdiff3plugin.cpp
M kdiff3plugin/kdiff3plugin.h
M src/Makefile.am
M src/Makefile.qt
M src/ccInstHelper.cpp
M src/common.cpp
M src/common.h
M src/diff.cpp
M src/diff.h
M src/difftextwindow.cpp
M src/difftextwindow.h
M src/directorymergewindow.cpp
M src/directorymergewindow.h
M src/fileaccess.cpp
M src/fileaccess.h
M src/gnudiff_analyze.cpp
M src/gnudiff_diff.h
M src/gnudiff_io.cpp
M src/kdiff3.cpp
M src/kdiff3.h
M src/kdiff3_part.cpp
M src/kdiff3_part.h
M src/kdiff3_shell.cpp
M src/kdiff3_shell.h
M src/kreplacements/ShellContextMenu.cpp
M src/kreplacements/ShellContextMenu.h
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/main.cpp
M src/mergeresultwindow.cpp
M src/mergeresultwindow.h
M src/optiondialog.cpp
M src/optiondialog.h
M src/pdiff.cpp
M src/smalldialogs.cpp
M src/smalldialogs.h
 ** Diff limit reached (max: 250 lines) **
e239d13e 2011-07-07 16:14:06 tpearson
Rename incorrect instances of tqrepaint[...] to repaint[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M src/directorymergewindow.cpp
 ** Diff limit reached (max: 250 lines) **
3d7cc5d2 2011-07-08 21:23:29 tpearson
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M kdiff3plugin/kdiff3plugin.cpp
M src/diff.h
M src/directorymergewindow.cpp
M src/fileaccess.cpp
M src/kdiff3.cpp
M src/kdiff3_part.cpp
M src/kdiff3_part.h
M src/kreplacements/kreplacements.h
M src/mergeresultwindow.cpp
M src/optiondialog.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
7b4db4f1 2011-08-03 13:10:36 tpearson
Fix instances of Orientation in quotes which were accidentally renamed to Qt::Orientation during TQt conversion


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1244690 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M src/kdiff3.cpp
 ** Diff limit reached (max: 250 lines) **
5173e6fc 2011-08-10 01:08:18 tpearson
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M diff_ext_for_kdiff3/diff_ext.cpp
M diff_ext_for_kdiff3/diffextstring.h
M src/ccInstHelper.cpp
M src/common.cpp
M src/diff.cpp
M src/difftextwindow.cpp
M src/directorymergewindow.cpp
M src/fileaccess.cpp
M src/gnudiff_analyze.cpp
M src/gnudiff_diff.h
M src/kdiff3_part.cpp
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/main.cpp
M src/mergeresultwindow.cpp
M src/optiondialog.cpp
M src/pdiff.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
721c5c4e 2011-08-10 17:19:39 tpearson
rename the following methods:
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M src/directorymergewindow.cpp
M src/fileaccess.cpp
M src/fileaccess.h
M src/gnudiff_diff.h
M src/gnudiff_io.cpp
M src/kdiff3.cpp
M src/kdiff3.h
M src/kdiff3_part.cpp
M src/kdiff3_part.h
M src/kreplacements/ShellContextMenu.cpp
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/optiondialog.cpp
M src/optiondialog.h
M src/pdiff.cpp
 ** Diff limit reached (max: 250 lines) **
f3d0a7ea 2011-08-20 20:43:11 tpearson
Convert remaining references to kde3 (e.g. in paths) to trinity


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M README
M acinclude.m4
M config.log
M doc/README
M doc/createpdfdoc
M kdiff3.kdevelop
M kdiff3.spec
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
e0ec84b8 2011-08-27 16:38:57 tpearson
Fix a number of accidental tqStatus string conversions


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M src/directorymergewindow.cpp
 ** Diff limit reached (max: 250 lines) **
b6bbc613 2011-08-30 23:15:04 tpearson
Fix remaining instances of tqStatus embedded in user visible strings


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M src/directorymergewindow.cpp
 ** Diff limit reached (max: 250 lines) **
19deb24b 2011-10-10 15:45:10 tpearson
Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
M src/Makefile.am
 ** Diff limit reached (max: 250 lines) **
457381c2 2011-11-04 16:46:34 Timothy Pearson
Added common directories
A .gitmodules
A admin
A cmake
 ** Diff limit reached (max: 250 lines) **
d53c3c4b 2011-11-05 21:46:06 Timothy Pearson
Rename kde libraries to tde
M acinclude.m4
M po/lt.po
 ** Diff limit reached (max: 250 lines) **
4cd5ed46 2011-11-05 22:05:23 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
025d8f27 2011-11-06 02:18:54 Timothy Pearson
Additional kde to tde renaming
M acinclude.m4
M config.log
M kdiff3plugin/kdiff3plugin.cpp
M kdiff3plugin/po/Makefile
M po/lt.po
M src/Makefile.am
 ** Diff limit reached (max: 250 lines) **
0a0e56cc 2011-11-06 03:05:50 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
9c03b625 2011-11-06 03:05:52 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
fb0af916 2011-11-06 16:18:26 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
0f1c9e8a 2011-11-06 21:33:10 Timothy Pearson
Rename additional instances of KDE to TDE
M acinclude.m4
M config.log
M kdiff3plugin/po/Makefile
M src/Makefile.am
 ** Diff limit reached (max: 250 lines) **
e7349e77 2011-11-06 22:26:12 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
93df6d2b 2011-11-07 20:15:45 Timothy Pearson
Rename kwin to twin (part 1 of 2)
M po/lt.po
 ** Diff limit reached (max: 250 lines) **
e457003b 2011-11-08 01:06:56 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
0e389e9c 2011-11-15 18:44:30 Timothy Pearson
Rename KDE_VERSION to TDE_VERSION
M src/kdiff3_shell.cpp
 ** Diff limit reached (max: 250 lines) **
5846de2c 2011-11-16 13:38:34 Timothy Pearson
Additional renaming of kde to tde
M README
M acinclude.m4
M configure.in
M doc/README
M kdiff3.kdevelop
M kdiff3.spec
M kdiff3plugin/po/de.po
M kdiff3plugin/po/it.po
M kdiff3plugin/po/nl.po
M kdiff3plugin/po/pt.po
M kdiff3plugin/po/pt_BR.po
M po/README
M po/createqm
M po/cvsgetpo
M po/de.po
M po/it.po
M po/lt.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
 ** Diff limit reached (max: 250 lines) **
d86f684c 2011-11-16 14:02:12 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
497ebbfc 2011-11-16 14:02:14 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
3267bd2f 2011-11-16 16:05:51 Timothy Pearson
Finish rename from prior commit
A kdiff3.tdevelop
R kdiff3.kdevelop
 ** Diff limit reached (max: 250 lines) **
d35f8c01 2011-11-18 02:08:28 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
986fa51d 2011-11-26 14:58:10 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
b1738d13 2011-12-03 23:36:17 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
31206cf8 2011-12-07 18:49:22 Timothy Pearson
Rename KDEHOME and KDEDIR
M README
M acinclude.m4
M configure.in
M kdiff3.spec
 ** Diff limit reached (max: 250 lines) **
b6e4d65c 2011-12-07 21:01:14 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
f3372e7b 2011-12-15 15:30:18 Timothy Pearson
Rename a number of old tq methods that are no longer tq specific
M kdiff3plugin/kdiff3plugin.cpp
M src/common.cpp
M src/diff.cpp
M src/diff.h
M src/difftextwindow.cpp
M src/directorymergewindow.cpp
M src/directorymergewindow.h
M src/fileaccess.cpp
M src/gnudiff_diff.h
M src/gnudiff_io.cpp
M src/kdiff3.cpp
M src/kdiff3.h
M src/kdiff3_part.cpp
M src/kreplacements/kreplacements.cpp
M src/main.cpp
M src/mergeresultwindow.cpp
M src/mergeresultwindow.h
M src/optiondialog.cpp
M src/optiondialog.h
M src/pdiff.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
303e1081 2011-12-16 09:56:04 Timothy Pearson
Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
M kdiff3plugin/kdiff3plugin.cpp
M src/common.cpp
M src/diff.cpp
M src/diff.h
M src/difftextwindow.cpp
M src/directorymergewindow.cpp
M src/directorymergewindow.h
M src/fileaccess.cpp
M src/gnudiff_diff.h
M src/gnudiff_io.cpp
M src/kdiff3.cpp
M src/kdiff3.h
M src/kdiff3_part.cpp
M src/kreplacements/kreplacements.cpp
M src/main.cpp
M src/mergeresultwindow.cpp
M src/mergeresultwindow.h
M src/optiondialog.cpp
M src/optiondialog.h
M src/pdiff.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
c7e29c46 2011-12-18 18:09:35 Timothy Pearson
Rename old tq methods that no longer need a unique name
M src/diff.h
M src/difftextwindow.cpp
M src/directorymergewindow.cpp
M src/directorymergewindow.h
M src/fileaccess.cpp
M src/kdiff3.cpp
M src/kdiff3.h
M src/mergeresultwindow.cpp
M src/mergeresultwindow.h
M src/pdiff.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
9b57232f 2011-12-19 11:36:20 Timothy Pearson
Remove additional unneeded tq method conversions
M kdiff3plugin/kdiff3plugin.cpp
M src/diff.cpp
M src/difftextwindow.cpp
M src/directorymergewindow.cpp
M src/fileaccess.cpp
M src/gnudiff_diff.h
M src/kdiff3.cpp
M src/kdiff3.h
M src/kreplacements/kreplacements.cpp
M src/mergeresultwindow.cpp
M src/optiondialog.cpp
M src/optiondialog.h
M src/pdiff.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
d654b107 2011-12-21 14:04:20 Timothy Pearson
Rename obsolete tq methods to standard names
M src/diff.cpp
M src/diff.h
M src/fileaccess.cpp
M src/gnudiff_io.cpp
M src/mergeresultwindow.cpp
M src/pdiff.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
d7d499ac 2011-12-26 20:05:08 Timothy Pearson
Rename KDE_MAKE_VERSION and update TDE version string
M src/kdiff3_shell.cpp
 ** Diff limit reached (max: 250 lines) **
04f3a1be 2012-01-01 00:38:47 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
119206ec 2012-01-02 12:27:33 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
0cc07573 2012-01-20 02:24:21 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
33c0651b 2012-01-22 00:10:29 Timothy Pearson
Part 1 of 2 of kdm rename
M po/lt.po
 ** Diff limit reached (max: 250 lines) **
ca0f381b 2012-01-30 11:58:46 Timothy Pearson
Rename ksocket and kcache
M po/lt.po
 ** Diff limit reached (max: 250 lines) **
af8347ba 2012-02-01 14:13:53 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
2cdeeb13 2012-02-02 04:15:46 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
de4a20b4 2012-02-02 14:47:04 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
ffe62cee 2012-02-07 18:13:19 Timothy Pearson
Rename include subdirectory to tde
M acinclude.m4
M config.log
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
623a44b3 2012-02-07 19:45:17 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
c7a64616 2012-02-10 13:51:33 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
4468919e 2012-02-11 14:44:26 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
7a5d023a 2012-02-11 14:44:28 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
de22503c 2012-02-12 15:20:40 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
475a396d 2012-02-14 21:07:52 Timothy Pearson
Update various qt function definitions and static methods for tqt3
M acinclude.m4
 ** Diff limit reached (max: 250 lines) **
22442c6d 2012-02-14 22:07:51 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
945e79ba 2012-02-16 18:03:58 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
86a28b5f 2012-02-17 15:59:30 Timothy Pearson
Remove spurious TQ_OBJECT instances
M kdiff3plugin/kdiff3plugin.h
M src/difftextwindow.h
M src/directorymergewindow.h
M src/fileaccess.h
M src/kdiff3.h
M src/kdiff3_part.h
M src/kdiff3_shell.h
M src/kreplacements/kreplacements.h
M src/mergeresultwindow.h
M src/optiondialog.h
M src/smalldialogs.h
 ** Diff limit reached (max: 250 lines) **
5e404a49 2012-02-19 16:37:07 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
c51757c3 2012-02-25 17:53:21 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
ac9a21d8 2012-02-26 14:16:53 Timothy Pearson
Rename kde-config to tde-config
M README
M acinclude.m4
M configure.in
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
f21c4d51 2012-02-26 16:00:50 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
7e272139 2012-02-26 16:00:51 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
14abbc9e 2012-03-06 00:57:19 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
4e31fcfa 2012-03-06 13:16:47 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
0e4e3abc 2012-03-07 21:07:51 Timothy Pearson
Rename additional members for tqt3
M src/fileaccess.cpp
 ** Diff limit reached (max: 250 lines) **
fe8ce33b 2012-03-13 03:40:49 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
3f02b2be 2012-03-21 16:47:45 Darrell Anderson
Change tqaddAction -> addAction. There is no tqaddAction defined in tqt headers.
M kdiff3plugin/kdiff3plugin.cpp
 ** Diff limit reached (max: 250 lines) **
86f9be34 2012-03-25 14:52:48 Darrell Anderson
Update docbook headers.
M doc/de/index.docbook
M doc/et/index.docbook
M doc/fr/index.docbook
M doc/it/index.docbook
M doc/nl/index.docbook
 ** Diff limit reached (max: 250 lines) **
a49f0b94 2012-03-26 16:44:56 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
97d683f3 2012-03-31 18:35:52 Darrell Anderson
Remove stray config.log.
R config.log
 ** Diff limit reached (max: 250 lines) **
03ff7edc 2012-04-10 23:24:52 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
9cf5d713 2012-04-10 23:24:53 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
9e7604e2 2012-04-11 10:42:33 Darrell Anderson
Update HTML install path references.
M acinclude.m4
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
2403e4a8 2012-04-12 22:13:31 Darrell Anderson
Fix branding image.
M doc/en/common/top-left.png
 ** Diff limit reached (max: 250 lines) **
934b9821 2012-04-14 18:16:57 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
45c2e597 2012-05-19 03:07:16 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
219c1f5c 2012-05-27 17:31:43 Darrell Anderson
Update lsm files.
M src/kdiff3.lsm
 ** Diff limit reached (max: 250 lines) **
c2872245 2012-06-08 16:42:39 Darrell Anderson
Update XDG information in support of bug report 892.
M acinclude.m4
M kdiff3plugin/kdiff3_plugin.desktop
M kdiff3plugin/kdiff3plugin.desktop
M kdiff3plugin/po/Makefile
M src/kdiff3.desktop
M src/kdiff3part.desktop
 ** Diff limit reached (max: 250 lines) **
28bea0d6 2012-06-08 17:35:39 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
848c92ff 2012-06-08 17:35:41 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
b3f2d671 2012-06-12 18:13:02 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
67d72e82 2012-06-14 02:44:18 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
d6903b01 2012-06-15 09:35:29 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
a9a0ce7d 2012-06-19 17:30:24 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
599e00b6 2012-06-21 21:07:25 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
76ae7615 2012-08-07 02:52:13 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
eec35ba4 2012-09-10 02:26:18 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
73150cf2 2012-09-14 23:12:38 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
20029be8 2012-10-26 15:31:25 Darrell Anderson
Add automake support for --enable-gcc-hidden-visibility.
M configure.in.in
 ** Diff limit reached (max: 250 lines) **
459abd0b 2012-11-04 01:01:54 Darrell Anderson
Fix references to user profile directory.
M README
 ** Diff limit reached (max: 250 lines) **
d3637691 2012-11-20 06:10:46 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
90d667e9 2012-11-20 06:10:49 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
53566c6e 2012-11-27 06:09:47 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
4ede6a1b 2012-11-27 06:09:51 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
c8fc7b9d 2013-01-19 18:46:26 Timothy Pearson
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
M src/kdiff3.cpp
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/main.cpp
 ** Diff limit reached (max: 250 lines) **
fe52f645 2013-01-19 23:54:46 Timothy Pearson
Rename KApplication to TDEApplication to avoid conflicts with KDE4
M acinclude.m4
M src/kdiff3.cpp
M src/kdiff3_shell.cpp
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/main.cpp
 ** Diff limit reached (max: 250 lines) **
046d6d18 2013-01-20 03:05:30 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
fd779193 2013-01-22 19:52:27 Timothy Pearson
Rename KInstance and KAboutData to avoid conflicts with KDE4
M src/kdiff3_part.cpp
M src/kdiff3_part.h
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/main.cpp
 ** Diff limit reached (max: 250 lines) **
f6fa7358 2013-01-22 21:40:56 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
672c9c39 2013-01-24 13:20:19 Timothy Pearson
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
M kdiff3plugin/kdiff3plugin.cpp
M src/kdiff3_shell.cpp
M src/kreplacements/kreplacements.h
M src/optiondialog.cpp
 ** Diff limit reached (max: 250 lines) **
bfd3620c 2013-01-25 00:07:22 Timothy Pearson
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
M src/fileaccess.cpp
M src/fileaccess.h
M src/kdiff3.cpp
M src/kdiff3.h
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/optiondialog.cpp
M src/optiondialog.h
 ** Diff limit reached (max: 250 lines) **
56c4d26d 2013-01-26 13:08:44 Timothy Pearson
Rename a number of libraries and executables to avoid conflicts with KDE4
A src/kreplacements/tdeparts/factory.h
A src/kreplacements/tdeparts/mainwindow.h
A src/kreplacements/tdeparts/part.h
M acinclude.m4
M kdiff3plugin/po/Makefile
M src/Makefile.am
M src/kdiff3.h
M src/kdiff3_part.h
M src/kdiff3_shell.h
R src/kreplacements/kparts/factory.h
R src/kreplacements/kparts/mainwindow.h
R src/kreplacements/kparts/part.h
 ** Diff limit reached (max: 250 lines) **
00d0a95b 2013-01-26 15:40:40 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
e9bf6fab 2013-01-27 00:52:47 Timothy Pearson
Rename a number of libraries and executables to avoid conflicts with KDE4
A src/kreplacements/tdeconfig.h
A src/kreplacements/tdefiledialog.h
M acinclude.m4
M kdiff3plugin/po/Makefile
M po/lt.po
M src/difftextwindow.cpp
M src/directorymergewindow.cpp
M src/fileaccess.cpp
M src/fileaccess.h
M src/kdiff3.cpp
M src/kdiff3_part.cpp
M src/kdiff3_shell.cpp
M src/optiondialog.cpp
M src/smalldialogs.cpp
R src/kreplacements/kconfig.h
R src/kreplacements/kfiledialog.h
 ** Diff limit reached (max: 250 lines) **
3670964e 2013-01-27 02:16:11 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
f47d5565 2013-01-27 02:16:13 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
0cb1f632 2013-01-27 20:55:55 Timothy Pearson
Rename kiobuffer and KHTML
M acinclude.m4
M cmake
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
f3f3ec89 2013-01-28 09:38:56 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
d6d68f9a 2013-01-28 10:22:20 Timothy Pearson
Fix up remaining references to -lkio
M acinclude.m4
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
78d2bce9 2013-01-29 23:20:32 Timothy Pearson
Rename a few build variables for overall consistency
M acinclude.m4
M kdiff3plugin/po/Makefile
M src/Makefile.am
 ** Diff limit reached (max: 250 lines) **
f2cdb243 2013-01-30 00:48:54 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
356c5b48 2013-01-30 13:40:27 Timothy Pearson
Fix a few remaining references to kio_
M po/lt.po
 ** Diff limit reached (max: 250 lines) **
6d70eafe 2013-01-31 13:17:06 Timothy Pearson
Rename KStandard for enhanced compatibility with KDE4
M kdiff3plugin/kdiff3plugin.cpp
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/main.cpp
 ** Diff limit reached (max: 250 lines) **
35cfeb12 2013-02-01 15:00:05 Timothy Pearson
Rename a number of classes to enhance compatibility with KDE4
M kdiff3plugin/kdiff3plugin.cpp
M src/directorymergewindow.cpp
M src/directorymergewindow.h
M src/kdiff3.cpp
M src/kdiff3.h
M src/kdiff3_part.cpp
M src/kdiff3_shell.h
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/optiondialog.cpp
M src/optiondialog.h
 ** Diff limit reached (max: 250 lines) **
821dbb34 2013-02-01 17:25:31 Timothy Pearson
Fix FTBFS
A src/kreplacements/tdeaccel.h
A src/kreplacements/tdeaction.h
A src/kreplacements/tdefontdialog.h
A src/kreplacements/tdemainwindow.h
A src/kreplacements/tdepopupmenu.h
R src/kreplacements/kaccel.h
R src/kreplacements/kaction.h
R src/kreplacements/kfontdialog.h
R src/kreplacements/kmainwindow.h
R src/kreplacements/kpopupmenu.h
 ** Diff limit reached (max: 250 lines) **
533c3127 2013-02-01 23:11:02 Timothy Pearson
Rename many classes and header files to avoid conflicts with KDE4
M doc/sv/index.docbook
M kdiff3plugin/kdiff3plugin.cpp
M po/lt.po
M src/directorymergewindow.cpp
M src/kdiff3.h
M src/kdiff3_part.cpp
M src/kdiff3_shell.cpp
M src/optiondialog.cpp
M src/pdiff.cpp
 ** Diff limit reached (max: 250 lines) **
c125e4cd 2013-02-04 14:02:36 Timothy Pearson
Rename KIcon to enhance compatibility with KDE4
M src/directorymergewindow.cpp
M src/directorymergewindow.h
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/optiondialog.cpp
 ** Diff limit reached (max: 250 lines) **
4e2575b1 2013-02-06 00:28:20 Timothy Pearson
Fix accidental networtde renames
M po/lt.po
 ** Diff limit reached (max: 250 lines) **
64eaa62d 2013-02-06 19:33:18 Timothy Pearson
Rename KCmd to avoid conflicts with KDE4
M src/kreplacements/kreplacements.cpp
M src/kreplacements/kreplacements.h
M src/main.cpp
 ** Diff limit reached (max: 250 lines) **
1d9f3db1 2013-02-11 05:30:50 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
5d58fe42 2013-02-14 17:04:54 Timothy Pearson
Rename common header files for consistency with class renaming
A src/kreplacements/tdeaboutdata.h
A src/kreplacements/tdeapplication.h
A src/kreplacements/tdecmdlineargs.h
M kdiff3plugin/kdiff3plugin.cpp
M src/kdiff3.cpp
M src/kdiff3.h
M src/kdiff3_part.cpp
M src/kdiff3_shell.h
M src/main.cpp
M src/optiondialog.cpp
M src/optiondialog.h
R src/kreplacements/kaboutdata.h
R src/kreplacements/kapplication.h
R src/kreplacements/kcmdlineargs.h
 ** Diff limit reached (max: 250 lines) **
dbf3ee6a 2013-02-15 21:45:50 Timothy Pearson
Rename additional header files to avoid conflicts with KDE4
M kdiff3plugin/kdiff3plugin.cpp
M src/diff.cpp
M src/difftextwindow.cpp
M src/directorymergewindow.cpp
M src/fileaccess.cpp
M src/kdiff3.cpp
M src/kdiff3_part.cpp
M src/kdiff3_shell.cpp
M src/main.cpp
M src/mergeresultwindow.cpp
M src/optiondialog.cpp
M src/pdiff.cpp
M src/smalldialogs.cpp
 ** Diff limit reached (max: 250 lines) **
aa70d768 2013-02-15 23:21:14 Timothy Pearson
Fix prior commit
A src/kreplacements/tdelocale.h
A src/kreplacements/tdemenubar.h
A src/kreplacements/tdemessagebox.h
A src/kreplacements/tdetempfile.h
R src/kreplacements/klocale.h
R src/kreplacements/kmenubar.h
R src/kreplacements/kmessagebox.h
R src/kreplacements/ktempfile.h
 ** Diff limit reached (max: 250 lines) **
eccff98f 2013-02-16 00:39:50 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
319ccbac 2013-02-16 00:39:53 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
af4a6145 2013-02-16 14:09:21 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
444dc983 2013-02-17 22:45:05 Timothy Pearson
Fix references to lkabc
M acinclude.m4
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
3192d81c 2013-02-18 14:24:17 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
c85caf7e 2013-02-19 01:21:33 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
95504260 2013-02-20 16:13:46 Timothy Pearson
Rename KABC namespace
M acinclude.m4
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
963e0b3d 2013-02-20 19:12:36 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
cc4cd840 2013-02-21 13:18:16 Timothy Pearson
Rename makekdewidgets
M acinclude.m4
 ** Diff limit reached (max: 250 lines) **
8606efc7 2013-02-21 13:39:09 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kdiff3
M admin
 ** Diff limit reached (max: 250 lines) **
dfd0ad1a 2013-02-21 15:09:37 Timothy Pearson
Second part of prior commit
M admin
M cmake
 ** Diff limit reached (max: 250 lines) **
02081598 2013-04-18 17:53:15 Darrell Anderson
Update files and references in support of bug report 1446.
M acinclude.m4
M doc/README
M doc/createpdfdoc
M doc/en/common/artistic-license.html
M doc/en/common/fdl-license.html
M doc/en/common/gpl-license.html
M doc/en/common/kde-localised.css.template
M doc/en/compilation.html
M doc/en/credits.html
M doc/en/dirmerge.html
M doc/en/dirmergeoptions.html
M doc/en/dirmergevisible.html
M doc/en/documentation.html
M doc/en/dothemerge.html
M doc/en/faq.html
M doc/en/features.html
M doc/en/find.html
M doc/en/index.html
M doc/en/installation.html
M doc/en/interpretinginformation.html
M doc/en/introduction.html
M doc/en/kpart.html
M doc/en/merging.html
M doc/en/misc.html
M doc/en/navigation.html
M doc/en/opendialog.html
M doc/en/options.html
M doc/en/other.html
M doc/en/pasteinput.html
M doc/en/preprocessors.html
M doc/en/printing.html
M doc/en/requirements.html
M doc/en/saving.html
M doc/en/screenshots.html
M doc/en/selections.html
M doc/en/startingdirmerge.html
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
82cf5ce0 2013-04-18 18:04:48 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
961f1e31 2013-04-18 19:00:20 Darrell Anderson
Fix hard-coded references.
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
fe9127ca 2013-04-18 19:00:37 Darrell Anderson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kdiff3
M admin
 ** Diff limit reached (max: 250 lines) **
e82e9366 2013-04-19 23:31:27 Darrell Anderson
Update desktop files in support of bug report 1463.
M src/kdiff3.desktop
 ** Diff limit reached (max: 250 lines) **
3070496e 2013-05-23 02:02:16 Darrell Anderson
Fix incorrect characters.
M src/fileaccess.cpp
 ** Diff limit reached (max: 250 lines) **
8ac2a6c1 2013-05-23 18:56:27 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
465bccf5 2013-08-27 15:54:48 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
6b734218 2013-08-29 18:36:00 Slávek Banko
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
7728fb7c 2013-09-03 12:57:00 Slávek Banko
Additional k => tde renaming and fixes
M README
M acinclude.m4
M admin
M doc/da/index.docbook
M doc/de/index.docbook
M doc/en/compilation.html
M doc/en/credits.html
M doc/en/dirmerge.html
M doc/en/dirmergeoptions.html
M doc/en/dirmergevisible.html
M doc/en/documentation.html
M doc/en/dothemerge.html
M doc/en/faq.html
M doc/en/features.html
M doc/en/find.html
M doc/en/index.docbook
M doc/en/index.html
M doc/en/installation.html
M doc/en/interpretinginformation.html
M doc/en/introduction.html
M doc/en/kdiff3.1
M doc/en/kpart.html
M doc/en/merging.html
M doc/en/misc.html
M doc/en/navigation.html
M doc/en/opendialog.html
M doc/en/options.html
M doc/en/other.html
M doc/en/pasteinput.html
M doc/en/preprocessors.html
M doc/en/printing.html
M doc/en/requirements.html
M doc/en/saving.html
M doc/en/screenshots.html
M doc/en/selections.html
M doc/en/startingdirmerge.html
M doc/es/index.docbook
M doc/et/index.docbook
M doc/fr/index.docbook
M doc/it/index.docbook
M doc/nl/index.docbook
M doc/pt/index.docbook
M doc/sv/index.docbook
M kdiff3.spec
M kdiff3plugin/po/Makefile
M kdiff3plugin/po/de.po
M kdiff3plugin/po/it.po
M kdiff3plugin/po/nl.po
M kdiff3plugin/po/pt.po
M kdiff3plugin/po/pt_BR.po
M po/README
M po/de.po
M po/it.po
M po/lt.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M src/Makefile.am
M src/fileaccess.cpp
M src/main.cpp
 ** Diff limit reached (max: 250 lines) **
bde6d9ec 2013-09-15 06:26:31 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
59cf4a31 2013-09-15 06:26:35 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
f0f4a6c0 2013-11-07 22:33:05 Timothy Pearson
Update minor TQt3 tool names to match current TQt3 sources in GIT
M po/README
M po/createqm
 ** Diff limit reached (max: 250 lines) **
fa751442 2013-12-23 06:09:13 Slávek Banko
Rename kdewidgets => tdewidgets
M acinclude.m4
M admin
M cmake
M kdiff3plugin/po/Makefile
 ** Diff limit reached (max: 250 lines) **
c4ceb49b 2014-01-12 17:20:04 Darrell Anderson
Fix incorrect Type= value causing tdeio KService warning.
M kdiff3plugin/kdiff3plugin.desktop
 ** Diff limit reached (max: 250 lines) **
7478ca6e 2014-01-13 23:20:08 Darrell Anderson
Fix help handbook, man page, and location of html doc files.
A data/Makefile.am
A data/doc/Makefile.am
A data/doc/compilation.html
A data/doc/credits.html
A data/doc/dirmerge.html
A data/doc/dirmergeoptions.html
A data/doc/dirmergevisible.html
A data/doc/documentation.html
A data/doc/dothemerge.html
A data/doc/faq.html
A data/doc/features.html
A data/doc/find.html
A data/doc/index.html
A data/doc/installation.html
A data/doc/interpretinginformation.html
A data/doc/introduction.html
A data/doc/kpart.html
A data/doc/merging.html
A data/doc/misc.html
A data/doc/navigation.html
A data/doc/opendialog.html
A data/doc/options.html
A data/doc/other.html
A data/doc/pasteinput.html
A data/doc/preprocessors.html
A data/doc/printing.html
A data/doc/requirements.html
A data/doc/saving.html
A data/doc/screenshots.html
A data/doc/selections.html
A data/doc/startingdirmerge.html
A man/Makefile.am
A man/kdiff3.1
M doc/en/Makefile.am
R doc/en/compilation.html
R doc/en/credits.html
R doc/en/dirmerge.html
R doc/en/dirmergeoptions.html
R doc/en/dirmergevisible.html
R doc/en/documentation.html
R doc/en/dothemerge.html
R doc/en/faq.html
R doc/en/features.html
R doc/en/find.html
R doc/en/index.html
R doc/en/installation.html
R doc/en/interpretinginformation.html
R doc/en/introduction.html
R doc/en/kdiff3.1
R doc/en/kpart.html
R doc/en/merging.html
R doc/en/misc.html
R doc/en/navigation.html
R doc/en/opendialog.html
R doc/en/options.html
R doc/en/other.html
R doc/en/pasteinput.html
R doc/en/preprocessors.html
R doc/en/printing.html
R doc/en/requirements.html
R doc/en/saving.html
R doc/en/screenshots.html
R doc/en/selections.html
R doc/en/startingdirmerge.html
 ** Diff limit reached (max: 250 lines) **
90172907 2014-02-02 18:31:13 Darrell Anderson
Add newlines to desktop files.
M kdiff3plugin/kdiff3plugin.desktop
 ** Diff limit reached (max: 250 lines) **
7dd0ab0b 2014-03-21 20:59:40 Slávek Banko
Add missing LDFLAGS causing FTBFS
M kdiff3plugin/Makefile.am
M src/Makefile.am
 ** Diff limit reached (max: 250 lines) **
a62c7393 2014-03-27 04:43:16 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
37148470 2014-03-27 04:43:19 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
86e33dd0 2014-03-28 19:58:44 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
9286b7ea 2014-04-17 01:19:28 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
54e691ba 2014-05-26 20:35:36 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
613c909d 2014-09-14 16:08:31 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
8396b4c8 2014-09-24 12:15:14 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
19d29f21 2014-09-28 22:09:11 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **
d6a90320 2014-09-29 10:36:07 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
374a04fb 2014-10-11 17:19:18 Timothy Pearson
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M kdiff3plugin/kdiff3_plugin.desktop
M src/kdiff3.desktop
M src/kdiff3part.desktop
 ** Diff limit reached (max: 250 lines) **
e8e4de95 2014-10-12 11:42:36 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
98bdd19f 2014-10-13 17:45:52 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
403cfd46 2014-10-14 12:09:54 Automated System
Reset submodule main/applications/kdiff3/cmake to latest HEAD
M cmake
 ** Diff limit reached (max: 250 lines) **
516bc79f 2014-10-19 21:55:46 Automated System
Reset submodule main/applications/kdiff3/admin to latest HEAD
M admin
 ** Diff limit reached (max: 250 lines) **