From f22ee1ec902fe2fc610786f39049fb84542b8726 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 13 Oct 2004 07:02:20 +0000
Subject: merging contacts

---
(limited to 'kabc/addressee.h')

diff --git a/kabc/addressee.h b/kabc/addressee.h
index 03138f6..e7900c6 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -116,7 +116,7 @@ class Addressee
     QString externalUID() const;
     void setOriginalExternalUID( const QString &id );
     QString originalExternalUID() const;
-    void mergeContact(  const Addressee& ad ); 
+    void mergeContact(  const Addressee& ad, bool isSubSet = false ); 
     void simplifyEmails();
     void simplifyAddresses();
     void simplifyPhoneNumbers();
--
cgit v0.9.0.2