diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-04-04 07:50:45 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-04-04 07:50:45 -0700 |
| commit | 2f779d8ce804de84fed55a6b0aa74499ef369852 (patch) | |
| tree | 6c2ce6ccea8faceb9c3bfa93536788e5bdaf2510 /src/ftfont.c | |
| parent | bc17d5d12474e57bb50535224be3c96349df383a (diff) | |
| parent | 3109d2bb17f975c045e1b683e73254e6d24ab017 (diff) | |
| download | emacs-2f779d8ce804de84fed55a6b0aa74499ef369852.tar.gz emacs-2f779d8ce804de84fed55a6b0aa74499ef369852.tar.bz2 emacs-2f779d8ce804de84fed55a6b0aa74499ef369852.zip | |
Merge from origin/emacs-26
3109d2b (origin/emacs-26) ; * lisp/ldefs-boot.el: Update.
86825c4 * etc/NEWS: Remove temporary markup.
737d0a2 * Update etc/AUTHORS
fbd03ba * ChangeLog.3: Update
56794ac Fix Bug#31022
a231c33 Update "Calendrical Calculations" cites
1527235 ; * doc/lispref/compile.texi (Compilation Functions): Fix wor...
b07decd ; * doc/lispref/compile.texi (Compilation Functions): Fix typo
a64c11a Fix term.el rendering following a window resize (Bug#30544)
1e6f09a * files.el (auto-save-visited-mode): Don't prompt for filenames.
eb8b13f ; * etc/NEWS: Improve the entry about pinentry.el removal.
52501ec Quote a few backticks in docstrings.
Conflicts:
etc/NEWS
lisp/ldefs-boot.el
Diffstat (limited to 'src/ftfont.c')
0 files changed, 0 insertions, 0 deletions