From f731dd9fc5b3f14c44d4de26eb5370a79c63887c Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 09 Jul 2005 08:48:32 +0000
Subject: fixi

---
(limited to 'korganizer/calendarview.h')

diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 706d05d..799c297 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -138,6 +138,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
     void checkSuspendAlarm();
+    void mergeFile( QString fn );
 
   signals:
     void save ();
--
cgit v0.9.0.2