summaryrefslogtreecommitdiffabout
path: root/korganizer/calendarview.h
Side-by-side diff
Diffstat (limited to 'korganizer/calendarview.h') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.h1
1 files changed, 1 insertions, 0 deletions
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 ();