diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:00 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:00 +0200 |
| commit | 7728fb7c70b281c817b9a49bd499abda882b076b (patch) | |
| tree | 9070ee9a32dcd2b6e0495b6fc596867fad4dd3ae /doc/en/screenshots.html | |
| parent | 6b734218e2765019caf6659e1ffefd0050d12800 (diff) | |
| download | kdiff3-7728fb7c70b281c817b9a49bd499abda882b076b.tar.gz kdiff3-7728fb7c70b281c817b9a49bd499abda882b076b.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'doc/en/screenshots.html')
| -rw-r--r-- | doc/en/screenshots.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/en/screenshots.html b/doc/en/screenshots.html index a63712d..23fdf40 100644 --- a/doc/en/screenshots.html +++ b/doc/en/screenshots.html @@ -1,4 +1,4 @@ -<html><head><title>Screenshots and Features</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="features.html" title="More Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Screenshots and Features</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="introduction.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="features.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="screenshots"></a>Screenshots and Features</h2></div></div></div><p>This screenshot shows the difference between two text files</p><p>(Using an early version of <span class="application">KDiff3</span>):</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><p> +<html><head><title>Screenshots and Features</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="features.html" title="More Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Screenshots and Features</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="introduction.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="features.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="screenshots"></a>Screenshots and Features</h2></div></div></div><p>This screenshot shows the difference between two text files</p><p>(Using an early version of <span class="application">KDiff3</span>):</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><p> 3-way-merging is fully supported. This is useful if two people change code independently. The original file (the base) is used to help <span class="application">KDiff3</span> to automatically select the correct changes. |