diff options
author | Miles Bader <miles@gnu.org> | 2004-02-03 21:46:35 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2004-02-03 21:46:35 +0000 |
commit | 95e224b7e32edf56ad482832775eb814e2e7a36c (patch) | |
tree | c440540f7a1438d2fafa70bfab6d040290a31357 /lisp/x-dnd.el | |
parent | bd5bbffe9b27d0227067bfdd9fa03a243b240296 (diff) | |
download | emacs-95e224b7e32edf56ad482832775eb814e2e7a36c.tar.gz |
Resolve CVS conflicts
Diffstat (limited to 'lisp/x-dnd.el')
-rw-r--r-- | lisp/x-dnd.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index ef9bb5fc08c..18fcb62d6bf 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -1,4 +1,3 @@ - ;;; x-dnd.el --- drag and drop support for X. ;; Copyright (C) 2004 @@ -601,5 +600,5 @@ FORMAT is 32 (not used). MESSAGE is the data part of an XClientMessageEvent." (provide 'x-dnd) -;;; arch-tag: ??? +;;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621 ;;; x-dnd.el ends here |