[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/ChangeLog,v
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/src/ChangeLog,v |
Date: |
Tue, 02 Sep 2008 11:45:18 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Andreas Schwab <schwab> 08/09/02 11:45:16
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6941
retrieving revision 1.6942
diff -u -b -r1.6941 -r1.6942
--- ChangeLog 2 Sep 2008 08:13:20 -0000 1.6941
+++ ChangeLog 2 Sep 2008 11:45:08 -0000 1.6942
@@ -1,5 +1,7 @@
2008-09-02 Andreas Schwab <address@hidden>
+ * xterm.c (x_delete_display): Fix merge error.
+
* fileio.c (Fexpand_file_name): Remove unused variables.
2008-09-02 Eli Zaretskii <address@hidden>
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Kenichi Handa, 2008/09/01
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Kenichi Handa, 2008/09/01
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Chong Yidong, 2008/09/01
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Miles Bader, 2008/09/02
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Andreas Schwab, 2008/09/02
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v,
Andreas Schwab <=
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Chong Yidong, 2008/09/02
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Kenichi Handa, 2008/09/04
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Eli Zaretskii, 2008/09/05
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Eli Zaretskii, 2008/09/06
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Eli Zaretskii, 2008/09/06
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Chong Yidong, 2008/09/06
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Roland Winkler, 2008/09/06
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Stefan Monnier, 2008/09/06
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Teodor Zlatanov, 2008/09/07
- [Emacs-diffs] Changes to emacs/src/ChangeLog,v, Chong Yidong, 2008/09/07