[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 7ce7369265c1f10dd23162045cb38c53602efa25

[Sune Vuorela]

The following commit has been merged in the master branch:
commit d94b81a81029de448ba2047faf4d971049737c1d
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Feb 17 23:11:18 2009 +0100

    fix up the header to match the actual function

diff --git a/diroperations/diroperations.h b/diroperations/diroperations.h
index b025e66..4cdf67e 100644
--- a/diroperations/diroperations.h
+++ b/diroperations/diroperations.h
@@ -74,8 +74,8 @@ namespace DirOperations {
      *  in destPath, it will stay and if it only exists in sourcePath, it will be ~
      *  copied over 
      */
-    void mergeDir(const QString & sourcePath, const QString & destPath,
-                        bool force = false, ProgressDialogInterface *pd = 0);
+    void mergeDirs(const QString & sourcePath, const QString & destPath,
+			ProgressDialogInterface *pd = 0);
     /*! Deletes directory \a dir and all of its contents. Works like "rm -r". */
     void recursiveRmDir(const QString & dir, ProgressDialogInterface *pd = 0);
 

-- 
Kaboom - Debian KDE 3->4 migration tool