cfc6cbbe06
KDiff3 is a program that: * compares or merges two or three text input files or directories, * shows the differences line by line and character by character (!), * provides an automatic merge-facility * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), * Automatic merging of version control history From MAINTAINER Lawrence Teo, after an initial port by marco@ ok sthen@
12 lines
351 B
Plaintext
12 lines
351 B
Plaintext
$OpenBSD: patch-src-QT4_optiondialog_cpp,v 1.1.1.1 2011/08/19 07:12:11 landry Exp $
|
|
--- src-QT4/optiondialog.cpp.orig Wed Aug 17 22:02:08 2011
|
|
+++ src-QT4/optiondialog.cpp Wed Aug 17 22:02:29 2011
|
|
@@ -34,6 +34,7 @@
|
|
#include <QPixmap>
|
|
#include <QFrame>
|
|
#include <QVBoxLayout>
|
|
+#include <QDir>
|
|
|
|
#include <kapplication.h>
|
|
#include <kcolorbutton.h>
|