diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /etc/ChangeLog | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'etc/ChangeLog')
| -rw-r--r-- | etc/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index c72c560ec9c..20f88bdecc3 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2015-01-11 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Default to 'configure --enable-silent-rules' | ||
| 4 | * NEWS: Document this. | ||
| 5 | |||
| 6 | 2015-01-10 Daniel Colascione <dancol@dancol.org> | ||
| 7 | |||
| 8 | * NEWS: Fix typo | ||
| 9 | |||
| 1 | 2015-01-04 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2015-01-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 11 | ||
| 3 | batch write-region no longer says "Wrote FOO" | 12 | batch write-region no longer says "Wrote FOO" |