diff options
| author | Joakim Verona | 2013-09-11 19:42:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 19:42:49 +0200 |
| commit | f20bcfe4144569d46d5e25685456af50820719f7 (patch) | |
| tree | 52492bdfecfa664388c50a9ad198511efda45d38 /src/ChangeLog | |
| parent | 41c0d73a318ece49776f1131a99e71253f953689 (diff) | |
| parent | 5ec0337a36f61c2bd6c7c3ef8102f7deeeafd09a (diff) | |
| download | emacs-f20bcfe4144569d46d5e25685456af50820719f7.tar.gz emacs-f20bcfe4144569d46d5e25685456af50820719f7.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e3fd6e96ec2..e1276f54d03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (usage_message): Possessive apostrophe tweak. | ||
| 4 | |||
| 1 | 2013-09-11 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-09-11 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | * nsterm.m (syms_of_nsterm): Use Qns. | 7 | * nsterm.m (syms_of_nsterm): Use Qns. |