projects / m17n / m17n-lib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0793e3b)
*** empty log message ***
authorhanda <handa>
Thu, 5 Apr 2007 04:58:11 +0000 (04:58 +0000)
committerhanda <handa>
Thu, 5 Apr 2007 04:58:11 +0000 (04:58 +0000)
src/ChangeLog patch | blob | history

diff --git a/src/ChangeLog b/src/ChangeLog
index a8b6c40..4f6c074 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -124,7 +124,6 @@
        (handle_key): When a key is unhandled, shift to the initial state
        only if the current state has no branch action.
 
->>>>>>> 1.284
 2007-02-12  Kenichi Handa  <handa@m17n.org>
 
        * input.c (get_preceding_char): Unref mt if necessary.