diff options
| author | Joakim Verona | 2013-08-13 04:30:54 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 04:30:54 +0200 |
| commit | a24dabe5ac4e7d051b9c1d6fc3bc17154ea0d042 (patch) | |
| tree | a7895c881938049c2812e62cce0afc27b4c56178 /src/ChangeLog | |
| parent | 30e2a1217667de18501bba00899c43a6f410906b (diff) | |
| parent | 5c41e9ffeaefbf8d01360c1fc911a324940573ee (diff) | |
| download | emacs-a24dabe5ac4e7d051b9c1d6fc3bc17154ea0d042.tar.gz emacs-a24dabe5ac4e7d051b9c1d6fc3bc17154ea0d042.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 04c89b63fa4..3b8dfe011ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-12 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * process.c (deactivate_process): Reset fds to -1 (Bug#15035). | ||
| 4 | This fixes a problem introduced by the Bug#15035 patch | ||
| 5 | when using GPG. Reported by Herbert J. Skuhra. | ||
| 6 | |||
| 1 | 2013-08-12 Eli Zaretskii <eliz@gnu.org> | 7 | 2013-08-12 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * decompress.c <zlib_initialized> [WINDOWSNT]: New static variable. | 9 | * decompress.c <zlib_initialized> [WINDOWSNT]: New static variable. |