Merged in changes from CVS trunk.
authorKaroly Lorentey <lorentey@elte.hu>
Thu, 2 Sep 2004 07:43:01 +0000 (07:43 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Thu, 2 Sep 2004 07:43:01 +0000 (07:43 +0000)
Patches applied:

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

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

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

1  2 
lisp/simple.el
lisp/x-dnd.el

diff --cc lisp/simple.el
Simple merge
diff --cc lisp/x-dnd.el
Simple merge