]> git.eshelyaron.com Git - emacs.git/commit
Fix merge conflicts in ldefs-boot.el.
authorEli Zaretskii <eliz@gnu.org>
Sat, 3 Apr 2010 13:59:53 +0000 (16:59 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 3 Apr 2010 13:59:53 +0000 (16:59 +0300)
commit0157365cb23163c179f7380f85fb5f693ad0c2f8
tree14f1f522693437c7dbe722c9c8981c39ed2eb8af
parent1502b819370b4194a3050702229ca3d239700e02
Fix merge conflicts in ldefs-boot.el.
lisp/ldefs-boot.el