Merge Semi-Himi-.

diff --git a/ChangeLog b/ChangeLog
index 0baaf03..d7def14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
+       * mime-pgp.el (mime-acting-condition): Separate type and subtype.
+
+       * mime-view.el (mime-acting-condition): Separate type and subtype.
+
+       * mime-play.el (mime-playback-entity): Separate type and subtype.
+
+1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
        * mime-pgp.el: Rename `mime-pgp-add-keys' ->
        `mime-method-to-add-application/pgp-keys'.
 
@@ -108,7 +116,7 @@
 \f
 1998-02-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae)\e-A was released.
+       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae) was released.\e-A
 
        * SEMI-ELS: Remove mime-tar.el.
 
@@ -245,7 +253,7 @@
 \f
 1997-11-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 0.116 (D\e-Dòhòji)\e-A was released.
+       * SEMI: Version 0.116 (D\e-Dòhòji) was released.\e-A
 
 1997-11-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>