Mercurial > emacs
comparison lisp/vc/vc-mtn.el @ 110018:aa172fa85851
merge trunk
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 30 Aug 2010 09:15:54 +0900 |
parents | 280c8ae2476d |
children | 1b626601d32d d3584b6b6247 |
comparison
equal
deleted
inserted
replaced
109990:7ab569e9f738 | 110018:aa172fa85851 |
---|---|
2 | 2 |
3 ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
6 ;; Keywords: vc | 6 ;; Keywords: vc |
7 ;; Package: vc | |
7 | 8 |
8 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |
9 | 10 |
10 ;; GNU Emacs is free software: you can redistribute it and/or modify | 11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
11 ;; it under the terms of the GNU General Public License as published by | 12 ;; it under the terms of the GNU General Public License as published by |