diff options
| author | Paul Eggert | 2017-03-14 13:44:11 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-03-14 14:50:02 -0700 |
| commit | fac0bb9cf76072941ae9dc9c7019929eb1a0f1dd (patch) | |
| tree | 1b9618b5eea568e8230b4348af3df1084bd63e67 /admin/notes | |
| parent | 5a64d78854998c2ed6d9b8de1b593d8462b8fa39 (diff) | |
| download | emacs-fac0bb9cf76072941ae9dc9c7019929eb1a0f1dd.tar.gz emacs-fac0bb9cf76072941ae9dc9c7019929eb1a0f1dd.zip | |
Merge from gnulib
This incorporates:
2017-03-14 snippets: move unadjusted snippet sources to lib
2017-03-14 gnulib-tool: fix typo in comment output
2017-03-14 snippets: work around GNU Make 3.82 VPATH
2017-03-13 gnulib-tool: minor --gnu-make fixups
2017-03-12 gnulib-tool: new option --gnu-make
* .gitignore: Remove lib/arg-nonnull.h, lib/c++defs.h,
lib/warn-on-use.h. Change exception from
build-aux/snippet/_Noreturn.h to lib/_Noreturn.h.
* admin/authors.el (authors-renamed-files-regexps):
* admin/notes/copyright, make-dist:
The snippet files moved from build-aux/snippet to lib.
* lib/_Noreturn.h: Rename from build-aux/snippet/_Noreturn.h.
* lib/arg-nonnull.h: Rename from build-aux/snippet/arg-nonnull.h.
* lib/c++defs.h: Rename from build-aux/snippet/c++defs.h.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/copyright | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index 16144fb8528..66c69ac0279 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -541,10 +541,6 @@ alone (may import them from Gnulib again). These are: | |||
| 541 | build-aux/depcomp | 541 | build-aux/depcomp |
| 542 | build-aux/missing | 542 | build-aux/missing |
| 543 | build-aux/move-if-change | 543 | build-aux/move-if-change |
| 544 | build-aux/snippet/_Noreturn.h | ||
| 545 | build-aux/snippet/arg-nonnull.h | ||
| 546 | build-aux/snippet/c++defs.h | ||
| 547 | build-aux/snippet/warn-on-use.h | ||
| 548 | doc/man/texinfo.tex | 544 | doc/man/texinfo.tex |
| 549 | lib/*.[ch] | 545 | lib/*.[ch] |
| 550 | lib/gnulib.mk | 546 | lib/gnulib.mk |