diff options
| author | Alan Mackenzie | 2014-11-22 21:44:23 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2014-11-22 21:44:23 +0000 |
| commit | 239cd5b62759b23020cb308d993b7e26933943d7 (patch) | |
| tree | 86f092a549604848103521a7f5bd6b3e325a7c3b /src/ChangeLog | |
| parent | ec02f4fe1d5ac0f7e306872434f96fcdfe00aead (diff) | |
| parent | d00c866167d95612ddc0debdeeb18601b063bcdc (diff) | |
| download | emacs-239cd5b62759b23020cb308d993b7e26933943d7.tar.gz emacs-239cd5b62759b23020cb308d993b7e26933943d7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
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 0f1d0478447..a474398ba78 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-11-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (emacs.res): Add dependency on icons/hand.cur. Use $<. | ||
| 4 | |||
| 1 | 2014-11-22 Martin Rudalics <rudalics@gmx.at> | 5 | 2014-11-22 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | Don't shrink frame when using desktop-save-mode (Bug#19048). | 7 | Don't shrink frame when using desktop-save-mode (Bug#19048). |