aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2005-04-01 01:30:38 +0000
committerKenichi Handa2005-04-01 01:30:38 +0000
commit9cf97f2680013b54e00d1f7f9b4ea187a85c8357 (patch)
tree03649172c0197b125a5c8dc35b5f9aad1ca43240 /src
parent946ce7853ac11fa31a0fe0304ab5e79a9dc41682 (diff)
downloademacs-9cf97f2680013b54e00d1f7f9b4ea187a85c8357.tar.gz
emacs-9cf97f2680013b54e00d1f7f9b4ea187a85c8357.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 517a0a2b479..9518de3af8f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
1<<<<<<< ChangeLog
22005-04-01 Kenichi Handa <handa@m17n.org> 12005-04-01 Kenichi Handa <handa@m17n.org>
3 2
4 * lisp.h (Vascii_upcase_table, Vascii_canon_table, 3 * lisp.h (Vascii_upcase_table, Vascii_canon_table,