From 21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Tue, 21 Oct 2003 18:51:30 +0000
Subject: Merge new-ui-branch into the trunk.

svn path=/trunk/; revision=22966
---
 libical/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'libical')

diff --git a/libical/ChangeLog b/libical/ChangeLog
index c6d5919adc..d8655dd243 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
+
+	* src/libicalss/icalssyacc.y: re-added missing header.
+
+	* src/libical/ical.h: added from HEAD.
+
 2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* src/libical/Makefile.am: Fixed INCLUDES and don't autogenerate
-- 
cgit v1.2.3