Mercurial > emacs
diff lisp/mouse.el @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 1d1d5d9bd884 |
children | d8144fe7f3f8 c145957f7705 |
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 1d1d5d9bd884 |
children | d8144fe7f3f8 c145957f7705 |