diff options
| author | Joakim Verona | 2013-08-13 09:16:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 09:16:29 +0200 |
| commit | 0b4c71fb6ca9382bee1dfa6996b7a5d67f469880 (patch) | |
| tree | 80ede09a1450c7098c5a88f0b20f2403eda47695 /etc/ChangeLog | |
| parent | b3797d24ab7fd78fe54583b5f9a59e7bc87208cd (diff) | |
| parent | 3e6b67c9b7230bf10219082d9215d9617a33715e (diff) | |
| download | emacs-0b4c71fb6ca9382bee1dfa6996b7a5d67f469880.tar.gz emacs-0b4c71fb6ca9382bee1dfa6996b7a5d67f469880.zip | |
merge from trunk
Diffstat (limited to 'etc/ChangeLog')
| -rw-r--r-- | etc/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index cbaa780a4a4..2c5bf37e3a7 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * refcards/Makefile (all_pdf, all_ps, fr-survival.ps, dist): | ||
| 4 | New rules. | ||
| 5 | (SURVIVAL_CARDS_PDF): Add fr_survival.pdf. | ||
| 6 | |||
| 1 | 2013-08-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | 7 | 2013-08-11 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 8 | ||
| 3 | * NEWS: Mention -lz and `decompress-gzipped-region'. | 9 | * NEWS: Mention -lz and `decompress-gzipped-region'. |