Mercurial > emacs
comparison lisp/x-dnd.el @ 53797:1f2fa74fb0aa
Resolve CVS conflicts
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 03 Feb 2004 21:46:35 +0000 |
parents | 75264649111c |
children | cc4faf95fea2 |
comparison
equal
deleted
inserted
replaced
53796:75264649111c | 53797:1f2fa74fb0aa |
---|---|
598 | 598 |
599 (t (error "Unknown XDND message %s %s" message data)))) | 599 (t (error "Unknown XDND message %s %s" message data)))) |
600 | 600 |
601 (provide 'x-dnd) | 601 (provide 'x-dnd) |
602 | 602 |
603 ;;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621 | |
603 ;;; x-dnd.el ends here | 604 ;;; x-dnd.el ends here |