* loadup.el: Fix merge problem, only load "button" once.
authorDan Nicolaescu <dann@ics.uci.edu>
Mon, 3 Sep 2007 16:48:04 +0000 (16:48 +0000)
committerDan Nicolaescu <dann@ics.uci.edu>
Mon, 3 Sep 2007 16:48:04 +0000 (16:48 +0000)
commitb7185a731cf3b899cd001e35e886467cb1ee8318
tree72f5a81fd9cd34550c835a4da56c9dff6df3e485
parent2fe32d09ebec4fabaacd995fcae46d82b9188625
* loadup.el: Fix merge problem, only load "button" once.
lisp/ChangeLog
lisp/loadup.el