aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2009-07-17 01:32:50 +0000
committerChong Yidong2009-07-17 01:32:50 +0000
commit806f1b46a3d173d3e28da063fbe8b15d555f9df0 (patch)
tree31ea722117141cbecadc63fb555a255b1dbfc5a9 /src/ChangeLog
parentfa0550553b3c55df3bf85b157335f4bc44c2c4c8 (diff)
downloademacs-806f1b46a3d173d3e28da063fbe8b15d555f9df0.tar.gz
emacs-806f1b46a3d173d3e28da063fbe8b15d555f9df0.zip
Fix last change.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 11189fc2d48..74468560362 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
1<<<<<<< ChangeLog
22009-07-17 Kenichi Handa <handa@m17n.org> 12009-07-17 Kenichi Handa <handa@m17n.org>
3 2
4 * casetab.c (shuffle): Fix the logic of setting up the cycle. 3 * casetab.c (shuffle): Fix the logic of setting up the cycle.