diff options
| author | Karoly Lorentey | 2007-01-29 22:21:19 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2007-01-29 22:21:19 +0000 |
| commit | 93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b (patch) | |
| tree | 6e4e3bec20b8c65eb1f78b0ad302fa6c1977d355 /src/ChangeLog.1 | |
| parent | 38db5c8d522cc1faa8190e77dbc932a5560e6aad (diff) | |
| parent | 5c4a60523827062803ab9a55b4325358225d66bf (diff) | |
| download | emacs-93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b.tar.gz emacs-93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-599
Merge from erc--main--0
* emacs@sv.gnu.org/emacs--devo--0--patch-600
Merge from erc--main--0
* emacs@sv.gnu.org/emacs--devo--0--patch-601
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-602
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-603
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-604
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-605
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-606
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-607
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-608
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-609
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-610
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-611
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-612
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-613
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-614
Make byte compiler correctly write circular constants
* emacs@sv.gnu.org/emacs--devo--0--patch-615
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-616
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-617
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-618
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-192
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-193
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-194
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-195
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-196
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-594
Diffstat (limited to 'src/ChangeLog.1')
| -rw-r--r-- | src/ChangeLog.1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index 94f1039f71e..4aaa3202dd6 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 | |||
| @@ -3522,7 +3522,8 @@ | |||
| 3522 | * minibuf.c: Don't allow entry to minibuffer | 3522 | * minibuf.c: Don't allow entry to minibuffer |
| 3523 | while minibuffer is selected. | 3523 | while minibuffer is selected. |
| 3524 | 3524 | ||
| 3525 | Copyright (C) 1985, 1986 Free Software Foundation, Inc. | 3525 | Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
| 3526 | Free Software Foundation, Inc. | ||
| 3526 | Copying and distribution of this file, with or without modification, | 3527 | Copying and distribution of this file, with or without modification, |
| 3527 | are permitted provided the copyright notice and this notice are preserved. | 3528 | are permitted provided the copyright notice and this notice are preserved. |
| 3528 | 3529 | ||