diff options
| author | Paul Eggert | 2011-06-02 01:25:28 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-02 01:25:28 -0700 |
| commit | 275a5dd65098a2d6fcc14c21f805fc8d5e4479ee (patch) | |
| tree | a03e79b0a7c066940ed02cd11927c7fd4080f092 /lib-src/ChangeLog | |
| parent | 97f4ea979720e535ade3fe0055fb710e18fb7b5d (diff) | |
| parent | f797625a8ca7bc973b6943c6fce97f1e479a283d (diff) | |
| download | emacs-275a5dd65098a2d6fcc14c21f805fc8d5e4479ee.tar.gz emacs-275a5dd65098a2d6fcc14c21f805fc8d5e4479ee.zip | |
Merge from trunk.
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 62ab9a12d4f..ff0d3da0a80 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-06-01 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * emacsclient.c (socket_status): Use constant pointer. | ||
| 4 | |||
| 1 | 2011-05-28 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2011-05-28 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Use 'inline', not 'INLINE'. | 7 | Use 'inline', not 'INLINE'. |