diff options
| author | Paul Eggert | 2011-06-02 00:42:55 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-02 00:42:55 -0700 |
| commit | af3c30cb283811135d9a1136fa5072e6922410a9 (patch) | |
| tree | 46c7ba217ef48f4951f6cb9ec8594d4169f6dfdc /lib-src/ChangeLog | |
| parent | 3870d916919d4ac5d052698e7ac61a04ad0beb94 (diff) | |
| parent | 7d5200893a8cc980744bb4c65355df5a936388bb (diff) | |
| download | emacs-af3c30cb283811135d9a1136fa5072e6922410a9.tar.gz emacs-af3c30cb283811135d9a1136fa5072e6922410a9.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'. |