diff options
| author | Stephen Leake | 2014-12-24 07:42:40 -0600 |
|---|---|---|
| committer | Stephen Leake | 2014-12-24 07:42:40 -0600 |
| commit | f3be0025481f15717198befe557208614e513e92 (patch) | |
| tree | c514ddea4da4b688c92d12f557f471c4edd1e990 /ChangeLog | |
| parent | b4161ac70e4206cc00263e0c1f765b4cf95dfd33 (diff) | |
| parent | 882370eaa4f7ad6a88396dfdc64f896c727f87f4 (diff) | |
| download | emacs-f3be0025481f15717198befe557208614e513e92.tar.gz emacs-f3be0025481f15717198befe557208614e513e92.zip | |
resolve ChangeLog merge conflict
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
| @@ -2,6 +2,14 @@ | |||
| 2 | 2 | ||
| 3 | * CONTRIBUTE: add Savannah url, cleanup announcing freeze. | 3 | * CONTRIBUTE: add Savannah url, cleanup announcing freeze. |
| 4 | 4 | ||
| 5 | 2014-12-23 Paul Eggert <eggert@cs.ucla.edu> | ||
| 6 | |||
| 7 | Merge from gnulib | ||
| 8 | 2014-12-20 utimens: remove unnecessary assert | ||
| 9 | 2014-12-16 stdalign: port better to HP compilers | ||
| 10 | 2014-12-16 stdalign: work around Apple GCC 4.0 bug | ||
| 11 | * lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib. | ||
| 12 | |||
| 5 | 2014-12-19 Stephen Leake <stephen_leake@stephe-leake.org> | 13 | 2014-12-19 Stephen Leake <stephen_leake@stephe-leake.org> |
| 6 | 14 | ||
| 7 | Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi | 15 | Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi |