From 3832b95386676efd3dc3689f2064b9cd3cbf5496 Mon Sep 17 00:00:00 2001
From: keiichi <keiichi>
Date: Tue, 10 Nov 1998 07:34:37 +0000
Subject: [PATCH] Update.

---
 ChangeLog |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f0fdd09..590fe2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+1998-11-10  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
+
+	* Sync up with `semi-vcard' branch.
+
+* 1998-11-07  Tanaka Akira  <akr@jaist.ac.jp>
+
+        * mime-view.el: (mime-display-text/x-vcard): Preserve encoding.
+
+* 1998-11-07  Tanaka Akira  <akr@jaist.ac.jp>
+
+        * mime-view.el: (mime-display-text/x-vcard): New function.
+        (mime-preview-condition): Set up for 'mime-preview-text/x-vcard.
+
+1998-11-10  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
+
+	* Create new branch `keiichi-1_11'.
+
 1998-11-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* mime-bbdb.el (mime-bbdb/update-record): Use
-- 
1.7.10.4