diff options
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/doc/Makefile.am | 3 | ||||
| -rw-r--r-- | data/doc/compilation.html (renamed from doc/en/compilation.html) | 0 | ||||
| -rw-r--r-- | data/doc/credits.html (renamed from doc/en/credits.html) | 0 | ||||
| -rw-r--r-- | data/doc/dirmerge.html (renamed from doc/en/dirmerge.html) | 0 | ||||
| -rw-r--r-- | data/doc/dirmergeoptions.html (renamed from doc/en/dirmergeoptions.html) | 0 | ||||
| -rw-r--r-- | data/doc/dirmergevisible.html (renamed from doc/en/dirmergevisible.html) | 0 | ||||
| -rw-r--r-- | data/doc/documentation.html (renamed from doc/en/documentation.html) | 0 | ||||
| -rw-r--r-- | data/doc/dothemerge.html (renamed from doc/en/dothemerge.html) | 0 | ||||
| -rw-r--r-- | data/doc/faq.html (renamed from doc/en/faq.html) | 0 | ||||
| -rw-r--r-- | data/doc/features.html (renamed from doc/en/features.html) | 0 | ||||
| -rw-r--r-- | data/doc/find.html (renamed from doc/en/find.html) | 0 | ||||
| -rw-r--r-- | data/doc/index.html (renamed from doc/en/index.html) | 0 | ||||
| -rw-r--r-- | data/doc/installation.html (renamed from doc/en/installation.html) | 0 | ||||
| -rw-r--r-- | data/doc/interpretinginformation.html (renamed from doc/en/interpretinginformation.html) | 0 | ||||
| -rw-r--r-- | data/doc/introduction.html (renamed from doc/en/introduction.html) | 0 | ||||
| -rw-r--r-- | data/doc/kpart.html (renamed from doc/en/kpart.html) | 0 | ||||
| -rw-r--r-- | data/doc/merging.html (renamed from doc/en/merging.html) | 0 | ||||
| -rw-r--r-- | data/doc/misc.html (renamed from doc/en/misc.html) | 0 | ||||
| -rw-r--r-- | data/doc/navigation.html (renamed from doc/en/navigation.html) | 0 | ||||
| -rw-r--r-- | data/doc/opendialog.html (renamed from doc/en/opendialog.html) | 0 | ||||
| -rw-r--r-- | data/doc/options.html (renamed from doc/en/options.html) | 0 | ||||
| -rw-r--r-- | data/doc/other.html (renamed from doc/en/other.html) | 0 | ||||
| -rw-r--r-- | data/doc/pasteinput.html (renamed from doc/en/pasteinput.html) | 0 | ||||
| -rw-r--r-- | data/doc/preprocessors.html (renamed from doc/en/preprocessors.html) | 0 | ||||
| -rw-r--r-- | data/doc/printing.html (renamed from doc/en/printing.html) | 0 | ||||
| -rw-r--r-- | data/doc/requirements.html (renamed from doc/en/requirements.html) | 0 | ||||
| -rw-r--r-- | data/doc/saving.html (renamed from doc/en/saving.html) | 0 | ||||
| -rw-r--r-- | data/doc/screenshots.html (renamed from doc/en/screenshots.html) | 0 | ||||
| -rw-r--r-- | data/doc/selections.html (renamed from doc/en/selections.html) | 0 | ||||
| -rw-r--r-- | data/doc/startingdirmerge.html (renamed from doc/en/startingdirmerge.html) | 0 | ||||
| -rw-r--r-- | doc/en/Makefile.am | 3 | ||||
| -rw-r--r-- | man/Makefile.am | 2 | ||||
| -rw-r--r-- | man/kdiff3.1 (renamed from doc/en/kdiff3.1) | 0 |
34 files changed, 6 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..d082367 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = doc diff --git a/data/doc/Makefile.am b/data/doc/Makefile.am new file mode 100644 index 0000000..2a4b61b --- /dev/null +++ b/data/doc/Makefile.am @@ -0,0 +1,3 @@ +kdiff3dir = ${kde_datadir}/kdiff3/doc + +kdiff3_DATA = compilation.html credits.html dirmerge.html dirmergeoptions.html dirmergevisible.html documentation.html dothemerge.html faq.html features.html find.html index.html installation.html interpretinginformation.html introduction.html kpart.html merging.html misc.html navigation.html opendialog.html options.html other.html pasteinput.html preprocessors.html printing.html requirements.html saving.html screenshots.html selections.html startingdirmerge.html diff --git a/doc/en/compilation.html b/data/doc/compilation.html index 7a5e030..7a5e030 100644 --- a/doc/en/compilation.html +++ b/data/doc/compilation.html diff --git a/doc/en/credits.html b/data/doc/credits.html index 36f86e4..36f86e4 100644 --- a/doc/en/credits.html +++ b/data/doc/credits.html diff --git a/doc/en/dirmerge.html b/data/doc/dirmerge.html index 995a580..995a580 100644 --- a/doc/en/dirmerge.html +++ b/data/doc/dirmerge.html diff --git a/doc/en/dirmergeoptions.html b/data/doc/dirmergeoptions.html index 2e40cd7..2e40cd7 100644 --- a/doc/en/dirmergeoptions.html +++ b/data/doc/dirmergeoptions.html diff --git a/doc/en/dirmergevisible.html b/data/doc/dirmergevisible.html index 8a6687c..8a6687c 100644 --- a/doc/en/dirmergevisible.html +++ b/data/doc/dirmergevisible.html diff --git a/doc/en/documentation.html b/data/doc/documentation.html index 969cf42..969cf42 100644 --- a/doc/en/documentation.html +++ b/data/doc/documentation.html diff --git a/doc/en/dothemerge.html b/data/doc/dothemerge.html index 3d965d5..3d965d5 100644 --- a/doc/en/dothemerge.html +++ b/data/doc/dothemerge.html diff --git a/doc/en/faq.html b/data/doc/faq.html index 5e170e9..5e170e9 100644 --- a/doc/en/faq.html +++ b/data/doc/faq.html diff --git a/doc/en/features.html b/data/doc/features.html index 598ac5f..598ac5f 100644 --- a/doc/en/features.html +++ b/data/doc/features.html diff --git a/doc/en/find.html b/data/doc/find.html index 330cfbe..330cfbe 100644 --- a/doc/en/find.html +++ b/data/doc/find.html diff --git a/doc/en/index.html b/data/doc/index.html index 04a04f6..04a04f6 100644 --- a/doc/en/index.html +++ b/data/doc/index.html diff --git a/doc/en/installation.html b/data/doc/installation.html index 03ae311..03ae311 100644 --- a/doc/en/installation.html +++ b/data/doc/installation.html diff --git a/doc/en/interpretinginformation.html b/data/doc/interpretinginformation.html index 3cf531e..3cf531e 100644 --- a/doc/en/interpretinginformation.html +++ b/data/doc/interpretinginformation.html diff --git a/doc/en/introduction.html b/data/doc/introduction.html index 8a2b5e9..8a2b5e9 100644 --- a/doc/en/introduction.html +++ b/data/doc/introduction.html diff --git a/doc/en/kpart.html b/data/doc/kpart.html index 685897c..685897c 100644 --- a/doc/en/kpart.html +++ b/data/doc/kpart.html diff --git a/doc/en/merging.html b/data/doc/merging.html index fab4a3b..fab4a3b 100644 --- a/doc/en/merging.html +++ b/data/doc/merging.html diff --git a/doc/en/misc.html b/data/doc/misc.html index 2b315ee..2b315ee 100644 --- a/doc/en/misc.html +++ b/data/doc/misc.html diff --git a/doc/en/navigation.html b/data/doc/navigation.html index 0235f7f..0235f7f 100644 --- a/doc/en/navigation.html +++ b/data/doc/navigation.html diff --git a/doc/en/opendialog.html b/data/doc/opendialog.html index 61e3838..61e3838 100644 --- a/doc/en/opendialog.html +++ b/data/doc/opendialog.html diff --git a/doc/en/options.html b/data/doc/options.html index 474af7f..474af7f 100644 --- a/doc/en/options.html +++ b/data/doc/options.html diff --git a/doc/en/other.html b/data/doc/other.html index 76703ce..76703ce 100644 --- a/doc/en/other.html +++ b/data/doc/other.html diff --git a/doc/en/pasteinput.html b/data/doc/pasteinput.html index 8c0a0d2..8c0a0d2 100644 --- a/doc/en/pasteinput.html +++ b/data/doc/pasteinput.html diff --git a/doc/en/preprocessors.html b/data/doc/preprocessors.html index fb8214e..fb8214e 100644 --- a/doc/en/preprocessors.html +++ b/data/doc/preprocessors.html diff --git a/doc/en/printing.html b/data/doc/printing.html index 04596ff..04596ff 100644 --- a/doc/en/printing.html +++ b/data/doc/printing.html diff --git a/doc/en/requirements.html b/data/doc/requirements.html index c556889..c556889 100644 --- a/doc/en/requirements.html +++ b/data/doc/requirements.html diff --git a/doc/en/saving.html b/data/doc/saving.html index 3d648fd..3d648fd 100644 --- a/doc/en/saving.html +++ b/data/doc/saving.html diff --git a/doc/en/screenshots.html b/data/doc/screenshots.html index 23fdf40..23fdf40 100644 --- a/doc/en/screenshots.html +++ b/data/doc/screenshots.html diff --git a/doc/en/selections.html b/data/doc/selections.html index 06c456d..06c456d 100644 --- a/doc/en/selections.html +++ b/data/doc/selections.html diff --git a/doc/en/startingdirmerge.html b/data/doc/startingdirmerge.html index fc5e84f..fc5e84f 100644 --- a/doc/en/startingdirmerge.html +++ b/data/doc/startingdirmerge.html diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index cd97965..fc2671d 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -1,5 +1,2 @@ KDE_DOCS = kdiff3 KDE_LANG = en -man1_MANS=kdiff3.1 - - diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..0cb1466 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,2 @@ +man_MANS = kdiff3.1 +EXTRA_DIST = $(man_MANS) diff --git a/doc/en/kdiff3.1 b/man/kdiff3.1 index 6f2d26b..6f2d26b 100644 --- a/doc/en/kdiff3.1 +++ b/man/kdiff3.1 |