]> git.eshelyaron.com Git - emacs.git/commit
Resolve CVS conflicts
authorMiles Bader <miles@gnu.org>
Sat, 8 Nov 2003 22:20:08 +0000 (22:20 +0000)
committerMiles Bader <miles@gnu.org>
Sat, 8 Nov 2003 22:20:08 +0000 (22:20 +0000)
commite4eaf898552db3dd02684e2f1ffe051362e11274
tree12c7554a5f69199a391be717ead73bfafb32d446
parentcfda993e1aea9634d5efabe048b3dc366c2c7171
Resolve CVS conflicts
lisp/language/kannada.el
lisp/language/knd-util.el