diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-01 23:46:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-01 23:46:34 -0700 |
| commit | 3fef57a2f66ec269f8ed016ad5bf39f2346c6b54 (patch) | |
| tree | cbe50e7c235a15b9db42a3c1299f45d54594314b | |
| parent | 9e7a4bcfd87cc6403a86729d4cb17b6e3ec27443 (diff) | |
| download | emacs-3fef57a2f66ec269f8ed016ad5bf39f2346c6b54.tar.gz emacs-3fef57a2f66ec269f8ed016ad5bf39f2346c6b54.tar.bz2 emacs-3fef57a2f66ec269f8ed016ad5bf39f2346c6b54.zip | |
* Makefile.in (INFO_FILES): Add emacs-gnutls;
accidentally omitted from 2012-04-12 backport from trunk.
(Do not merge to trunk.)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 8f92ad7896d..46dff7c807f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-02 Glenn Morris <rgm@gnu.org> + * Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally + omitted from 2012-04-12 backport from trunk. + * info/dir: Make some entries consistent with the source texi files. * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. @@ -10,7 +13,7 @@ 2012-04-12 Teodor Zlatanov <tzz@lifelogs.com> - * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls. + * info/dir: Add emacs-gnutls. 2012-03-04 Paul Eggert <eggert@cs.ucla.edu> diff --git a/Makefile.in b/Makefile.in index af0c902b381..d57c1690f47 100644 --- a/Makefile.in +++ b/Makefile.in @@ -136,7 +136,7 @@ MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ # system, it is inappropriate to imply that it is part of Emacs. infodir=@infodir@ INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ - ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ + ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls emacs-mime epa erc \ ert eshell eudc flymake forms gnus idlwave info mairix-el \ message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ reftex remember sasl sc semantic ses sieve smtpmail speedbar \ |