Mercurial > emacs
annotate etc/README @ 112271:8f641c1fc9cc
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 15 Jan 2011 12:42:23 -0800 |
parents | 376148b31b5e |
children |
rev | line source |
---|---|
580 | 1 This directory contains the architecture-independent files used by or |
2 with Emacs. This includes some text files of documentation for GNU | |
3 Emacs or of interest to Emacs users, and the file of dumped docstrings | |
4 for Emacs functions and variables. | |
5 | |
94363 | 6 `forms-d2.dat' is an example data file used by forms-d2.el. |
41452
09e762a010e0
Document the URLs where one can find special versions of TeX required for
Eli Zaretskii <eliz@gnu.org>
parents:
12680
diff
changeset
|
7 |
75650
48e11b5cb31e
List copyright and license information for Emacs splash images.
Glenn Morris <rgm@gnu.org>
parents:
75343
diff
changeset
|
8 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES |
48e11b5cb31e
List copyright and license information for Emacs splash images.
Glenn Morris <rgm@gnu.org>
parents:
75343
diff
changeset
|
9 |
75825
73762f886086
Add copyright information for emacs.icon (from authors.el).
Chong Yidong <cyd@stupidchicken.com>
parents:
75774
diff
changeset
|
10 File: emacs.icon |
73762f886086
Add copyright information for emacs.icon (from authors.el).
Chong Yidong <cyd@stupidchicken.com>
parents:
75774
diff
changeset
|
11 Author: Sun Microsystems, Inc |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
12 Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
75863
6112f0f47f01
Update years on emacs.icon copyright.
Glenn Morris <rgm@gnu.org>
parents:
75825
diff
changeset
|
13 Free Software Foundation, Inc. |
78626
14c1feed4904
Update GPL version for Emacs images.
Glenn Morris <rgm@gnu.org>
parents:
78271
diff
changeset
|
14 License: GNU General Public License version 3 or later (see COPYING) |