diff options
| author | Paul Eggert | 2011-06-25 11:31:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-25 11:31:36 -0700 |
| commit | 948b98fd3c17e56b5fa606eedbe6487091f2b66d (patch) | |
| tree | 470d98f5aa36d512902da3db4d9f35b3c0fe6f07 /lib-src/ChangeLog | |
| parent | 7a7ef429182915745380c3074771d9f747dab964 (diff) | |
| parent | 11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20 (diff) | |
| download | emacs-948b98fd3c17e56b5fa606eedbe6487091f2b66d.tar.gz emacs-948b98fd3c17e56b5fa606eedbe6487091f2b66d.zip | |
Merge from trunk.
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ec123e85036..b7a95fe8043 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2011-06-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacsclient.c (decode_options) <opt>: Add `F:'. | ||
| 4 | (print_help_and_exit): Mention --frame-parameters. | ||
| 5 | |||
| 6 | 2011-06-25 Andreas Rottmann <a.rottmann@gmx.at> | ||
| 7 | |||
| 8 | * emacsclient.c (longopts, decode_options, main): Add frame-parameters. | ||
| 9 | |||
| 1 | 2011-06-10 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2011-06-10 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 11 | ||
| 3 | * movemail.c: Fix race condition and related bugs (Bug#8836). | 12 | * movemail.c: Fix race condition and related bugs (Bug#8836). |