]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0dfe700 113fcc3)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:49:27 +0000 (18:49 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:49:27 +0000 (18:49 -0700)
commit59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d
tree14f76279dfbe805aefb1f11b8b23ea6d9aa192f0tree | snapshot
parent0dfe7002a6b6f330b981e2d40f372bf71eeac1dfcommit | diff
parent113fcc3b739d6a024e41a5727aeddca7aaf1cb81commit | diff
Merge from origin/emacs-24

113fcc3 * etc/AUTHORS: Update the AUTHORS file
51c0c8d * lisp/ChangeLog: Fix a changelog entry

Conflicts:
etc/AUTHORS
etc/AUTHORS diff1 | diff2 | blob | history
lisp/ChangeLog diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.