diff options
| author | Glenn Morris | 2012-06-26 23:55:01 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-06-26 23:55:01 -0700 |
| commit | 7983050d181d2fd4020db5f3736ed94d104aea5d (patch) | |
| tree | 53a9a8aa334b84b271c2d97448e830bfe1df8d4c /src | |
| parent | c89926a5f14afd9c409f3ba20d9380e1c95d65cb (diff) | |
| download | emacs-7983050d181d2fd4020db5f3736ed94d104aea5d.tar.gz emacs-7983050d181d2fd4020db5f3736ed94d104aea5d.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 |
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 @@ | |||
| 175 | when time_t is unsigned and as wide as intmax_t. | 175 | when time_t is unsigned and as wide as intmax_t. |
| 176 | See <http://bugs.gnu.org/9000#51>. | 176 | See <http://bugs.gnu.org/9000#51>. |
| 177 | 177 | ||
| 178 | 2012-06-26 Andreas Schwab <schwab@linux-m68k.org> | ||
| 179 | |||
| 180 | * gnutls.c (emacs_gnutls_handshake): Only retry if | ||
| 181 | GNUTLS_E_INTERRUPTED. | ||
| 182 | |||
| 183 | 2012-06-23 Eli Zaretskii <eliz@gnu.org> | 178 | 2012-06-23 Eli Zaretskii <eliz@gnu.org> |
| 184 | 179 | ||
| 185 | * dispnew.c (sit_for, Fsleep_for): | 180 | * dispnew.c (sit_for, Fsleep_for): |