summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-06-26 23:55:01 -0700
committerGlenn Morris <rgm@gnu.org>2012-06-26 23:55:01 -0700
commit7983050d181d2fd4020db5f3736ed94d104aea5d (patch)
tree53a9a8aa334b84b271c2d97448e830bfe1df8d4c
parentc89926a5f14afd9c409f3ba20d9380e1c95d65cb (diff)
downloademacs-7983050d181d2fd4020db5f3736ed94d104aea5d.tar.gz
Fix ChangeLog entry from trunk 2012-06-27T03:52:02Z!jwiegley@gmail.com.
For some reason, this included an extraneous entry from the emacs-24 branch.
-rw-r--r--src/ChangeLog5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4614ba09b3d..c9d10c50717 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -175,11 +175,6 @@
when time_t is unsigned and as wide as intmax_t.
See <http://bugs.gnu.org/9000#51>.
-2012-06-26 Andreas Schwab <schwab@linux-m68k.org>
-
- * gnutls.c (emacs_gnutls_handshake): Only retry if
- GNUTLS_E_INTERRUPTED.
-
2012-06-23 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (sit_for, Fsleep_for):