summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2005-07-19 02:58:20 +0000
committerKenichi Handa <handa@m17n.org>2005-07-19 02:58:20 +0000
commit3e03f554f116e04ba860dcde7c6d862939911e16 (patch)
tree194f5ad43e4819f2c5ef82ed830d136b2a7e8b58 /src
parentbacb9790f594207469f22ed9f3e8085ab76e5e2b (diff)
downloademacs-3e03f554f116e04ba860dcde7c6d862939911e16.tar.gz
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.unicode1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index a9d333ec898..7bd3398db4a 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1054,7 +1054,6 @@
* window.c (Fdisplay_buffer, Fframe_selected_window): Remove
unsued vars.
->>>>>>> 1.1.2.8
2003-09-26 Dave Love <fx@gnu.org>
* xterm.c (x_bitmap_mask): Declare.