Mercurial > emacs
comparison lisp/vc.el @ 83332:6c13700d1c13
Merged from miles@gnu.org--gnu-2005 (patch 469)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-469
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-372
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 05 Jul 2005 22:22:24 +0000 |
parents | e58cb448e07c 6fb026ad601f |
children | 532e0a9335a9 |
comparison
equal
deleted
inserted
replaced
83331:efa9e4606e7e | 83332:6c13700d1c13 |
---|---|
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
22 ;; GNU General Public License for more details. | 22 ;; GNU General Public License for more details. |
23 | 23 |
24 ;; You should have received a copy of the GNU General Public License | 24 ;; You should have received a copy of the GNU General Public License |
25 ;; along with GNU Emacs; see the file COPYING. If not, write to the | 25 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 26 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
27 ;; Boston, MA 02111-1307, USA. | 27 ;; Boston, MA 02110-1301, USA. |
28 | 28 |
29 ;;; Credits: | 29 ;;; Credits: |
30 | 30 |
31 ;; VC was initially designed and implemented by Eric S. Raymond | 31 ;; VC was initially designed and implemented by Eric S. Raymond |
32 ;; <esr@snark.thyrsus.com>. Over the years, many people have | 32 ;; <esr@snark.thyrsus.com>. Over the years, many people have |