]> git.eshelyaron.com Git - emacs.git/commit
More fixes for 2007-08-21 merge conflict.
authorJuri Linkov <juri@jurta.org>
Fri, 24 Aug 2007 22:18:04 +0000 (22:18 +0000)
committerJuri Linkov <juri@jurta.org>
Fri, 24 Aug 2007 22:18:04 +0000 (22:18 +0000)
commitfa7e0e98d9034ff8ba48bc3f293b6517f1fa374e
tree17d6f58f9fa4ada120c595133ca0802613a80f41
parente9acd138fad958de844979f525594a7a7e336f72
More fixes for 2007-08-21 merge conflict.
lisp/startup.el