diff options
| author | Juanma Barranquero | 2010-10-08 12:14:47 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-10-08 12:14:47 +0200 |
| commit | 4628bef1eea0f60e846fe6b6591725aa92952de9 (patch) | |
| tree | 9d137b8e0964c0b1ebc4afb4e743e35b807d048d /lib-src/ChangeLog | |
| parent | 24ac444fbe5d76a7cf09a62b741b9e956ab90d3e (diff) | |
| parent | 2b7c934285417d2eac7a3c603231d22ce7e212d8 (diff) | |
| download | emacs-4628bef1eea0f60e846fe6b6591725aa92952de9.tar.gz emacs-4628bef1eea0f60e846fe6b6591725aa92952de9.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 6d5bf6c4e5b..50528a4508c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-10-08 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back | ||
| 4 | DARWIN_USER_TEMP_DIR. (Bug#3992) | ||
| 5 | |||
| 1 | 2010-10-03 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2010-10-03 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | * test-distrib.c (cool_read): | 8 | * test-distrib.c (cool_read): |