Mercurial > emacs
comparison lisp/master.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; master.el --- make a buffer the master over another buffer | 1 ;;; master.el --- make a buffer the master over another buffer |
2 | 2 |
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
4 ;; Free Software Foundation, Inc. | 4 ;; Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: Alex Schroeder <alex@gnu.org> | 6 ;; Author: Alex Schroeder <alex@gnu.org> |
7 ;; Maintainer: Alex Schroeder <alex@gnu.org> | 7 ;; Maintainer: Alex Schroeder <alex@gnu.org> |
8 ;; Version: 1.0.2 | 8 ;; Version: 1.0.2 |