emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r110539: ChangeLog fix


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r110539: ChangeLog fix
Date: Sat, 13 Oct 2012 17:17:07 -0700
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 110539
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-13 17:17:07 -0700
message:
  ChangeLog fix
modified:
  src/ChangeLog
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-13 21:52:09 +0000
+++ b/src/ChangeLog     2012-10-14 00:17:07 +0000
@@ -1294,7 +1294,6 @@
        * sysdep.c (init_signals): Do not use SA_NODEFER.  It wasn't
        wanted even on POSIXish hosts, and it doesn't work on Windows.
 
->>>>>>> MERGE-SOURCE
 2012-09-23  Jan Djärv  <address@hidden>
 
        * xterm.c (x_term_init): Call fixup_locale before and after calling


reply via email to

[Prev in Thread] Current Thread [Next in Thread]