aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/providers/nntp/camel-nntp-newsrc.h2
-rw-r--r--libical/ChangeLog4
-rw-r--r--libical/src/libical/icalvcal.h39
3 files changed, 6 insertions, 39 deletions
diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h
index 3f4be6de8d..47539a6f80 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.h
+++ b/camel/providers/nntp/camel-nntp-newsrc.h
@@ -25,3 +25,5 @@ void camel_nntp_newsrc_write (CamelNNTPNewsrc *newsrc
CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server (const char *server);
#endif /* _CAMEL_NNTP_NEWSRC_H_ */
+
+
diff --git a/libical/ChangeLog b/libical/ChangeLog
index a97cb99870..0db81ea4d2 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-24 JP Rosevear <jpr@helixcode.com>
+
+ * src/libical/icalvcal.h: Remove this duplicate file to fix build
+
2000-08-24 Federico Mena Quintero <federico@helixcode.com>
* src/test/Makefile.am: Make it work.
diff --git a/libical/src/libical/icalvcal.h b/libical/src/libical/icalvcal.h
deleted file mode 100644
index 3a1098e6c2..0000000000
--- a/libical/src/libical/icalvcal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalvcal.h
- CREATOR: eric 13 January 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALVCAL_H
-#define ICALVCAL_H
-
-VCalObject* icalvcal_new_vcal_from_ical(icalcomponent* component);
-icalcomponent* icalvcal_new_ical_from_vcal(VCalObject* vcal);
-
-
-#endif /* !ICALVCAL_H */
-
-
-