]> code.delx.au - gnu-emacs/commitdiff
Merged in changes from CVS HEAD
authorKaroly Lorentey <lorentey@elte.hu>
Sun, 11 Jan 2004 23:12:24 +0000 (23:12 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Sun, 11 Jan 2004 23:12:24 +0000 (23:12 +0000)
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-31
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-55

1  2 
src/alloc.c

diff --cc src/alloc.c
Simple merge