diff options
| author | Miles Bader | 2006-10-03 05:04:21 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-10-03 05:04:21 +0000 |
| commit | f3bbbd11451643c49997116d639612ae434dcaa0 (patch) | |
| tree | 6ce54c0dbf43746478357847960e9621fe3a5719 /lib-src | |
| parent | 84356ba74da100da043fea790d1253b2d92e9110 (diff) | |
| parent | 670992917f2ee196a667797e4c3806d89c0f6d61 (diff) | |
| download | emacs-f3bbbd11451643c49997116d639612ae434dcaa0.tar.gz emacs-f3bbbd11451643c49997116d639612ae434dcaa0.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 447-459)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 141-144)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/.gitignore | 1 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib-src/.gitignore b/lib-src/.gitignore index 83a67e67579..faf263e740d 100644 --- a/lib-src/.gitignore +++ b/lib-src/.gitignore | |||
| @@ -21,5 +21,6 @@ update-game-score | |||
| 21 | yow | 21 | yow |
| 22 | Makefile | 22 | Makefile |
| 23 | makefile | 23 | makefile |
| 24 | blessmail | ||
| 24 | *-spd | 25 | *-spd |
| 25 | *.pdb | 26 | *.pdb |
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c6ca6132d0f..45fb6d6513e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-09-30 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * .cvsignore: Add blessmail. | ||
| 4 | |||
| 1 | 2006-09-15 Jay Belanger <belanger@truman.edu> | 5 | 2006-09-15 Jay Belanger <belanger@truman.edu> |
| 2 | 6 | ||
| 3 | * COPYING: Replace "Library Public License" by "Lesser Public | 7 | * COPYING: Replace "Library Public License" by "Lesser Public |