summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-05-26 12:41:38 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-05-26 12:41:38 -0700
commit018be26a1a1851e7f7f92cb0289b0c30c329aa1c (patch)
tree50118cd6daa26989091234d1a7ec42207a6376fa
parent7ed767557eb608a0ad7097dc80d84af568ab00b1 (diff)
parent2d76405c5b7c189cb48348126f1ee4c8cea7ad39 (diff)
downloademacs-018be26a1a1851e7f7f92cb0289b0c30c329aa1c.tar.gz
emacs-018be26a1a1851e7f7f92cb0289b0c30c329aa1c.tar.bz2
emacs-018be26a1a1851e7f7f92cb0289b0c30c329aa1c.zip
Merge from origin/emacs-25
2d76405 etc/AUTHORS: Update the AUTHORS file
-rw-r--r--etc/AUTHORS3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 14e4fd39f39..760d7354ba5 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -1161,6 +1161,7 @@ Dmitry Dzhus: changed gdb-mi.el gud.el fadr.el all.xpm building.texi
Dmitry Gorbik: changed org.el
Dmitry Gutov: wrote elisp-mode-tests.el json-tests.el vc-hg.el
+ xref-tests.el
and changed ruby-mode.el xref.el elisp-mode.el etags.el project.el
ruby-mode-tests.el vc-git.el ruby.rb package.el vc.el js.el log-edit.el
menu-bar.el vc-svn.el minibuffer.el package-test.el progmodes/grep.el
@@ -3480,7 +3481,7 @@ and co-wrote cal-dst.el
and changed lisp.h configure.ac alloc.c process.c xdisp.c fileio.c
sysdep.c keyboard.c image.c editfns.c emacs.c xterm.c lread.c data.c
callproc.c fns.c Makefile.in eval.c buffer.c dispnew.c gnulib.mk
- and 1472 other files
+ and 1473 other files
Paul Fisher: changed fns.c