10 commits

Author	SHA1	Message	Date
Paul Eggert	0e963201d0	Update copyright year to 2016 ... Run admin/update-copyright.	2016-01-01 01:34:24 -08:00
Paul Eggert	7e09ef09a4	Update copyright year to 2015 ... Run admin/update-copyright.	2015-01-01 14:26:41 -08:00
Paul Eggert	ba3189039a	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
Paul Eggert	ab422c4d68	Update copyright notices for 2013.	2013-01-01 09:11:05 +00:00
Glenn Morris	acaf905b11	Add 2012 to FSF copyright years for Emacs files	2012-01-05 01:46:05 -08:00
Glenn Morris	73b0cd5003	Convert consecutive FSF copyright years to ranges.	2011-01-24 20:08:28 -08:00
Glenn Morris	0d9f702fd0	Nuke arch-tags.	2011-01-15 15:16:57 -08:00
Stefan Monnier	77ab81d054	Merge from emacs-23	2011-01-14 12:18:41 -05:00
Chong Yidong	bd78fa1d54	Add "Package:" file headers to denote built-in packages.	2010-08-29 12:17:13 -04:00
Juri Linkov	56b2854f30	Move version control related files to the "vc" subdirectory. ... * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.	2010-06-11 21:51:00 +03:00

Renamed from lisp/ediff-hook.el (Browse further)