summaryrefslogtreecommitdiffstats
path: root/src/kdiff3.h
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2020-06-27 14:46:01 +0200
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-06-27 23:56:04 +0900
commita2bdb366d23ad3ae27e317bbdf5c966c71863d75 (patch)
tree2ac4e8942bd42ccaf1dead861cb7f68bcce4e5ed /src/kdiff3.h
parent91b7acd6bbe54b36f6e4b9597c4cf5572c9eb40c (diff)
downloadkdiff3-a2bdb366d23ad3ae27e317bbdf5c966c71863d75.tar.gz
kdiff3-a2bdb366d23ad3ae27e317bbdf5c966c71863d75.zip
Drop automake build support.
Add basic cmake build instructions. Delete the NEWS file. Rework of the README. The man folder has been moved into the doc folder for consistency with what have been done so far. The html pages have been moved into the doc folder as well. Some cosmetics. Signed-off-by: gregory guy <gregory-tde@laposte.net> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
Diffstat (limited to 'src/kdiff3.h')
-rw-r--r--src/kdiff3.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kdiff3.h b/src/kdiff3.h
index 3bd90f9..e48f42b 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -18,12 +18,12 @@
#ifndef KDIFF3_H
#define KDIFF3_H
-#include "diff.h"
-
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
+#include "diff.h"
+
// include files for TQt
#include <tqdialog.h>
#include <tqsplitter.h>