]> git.eshelyaron.com Git - emacs.git/commit
resolve ChangeLog merge conflict
authorStephen Leake <stephen_leake@stephe-leake.org>
Wed, 24 Dec 2014 13:42:40 +0000 (07:42 -0600)
committerStephen Leake <stephen_leake@stephe-leake.org>
Wed, 24 Dec 2014 13:42:40 +0000 (07:42 -0600)
commitf3be0025481f15717198befe557208614e513e92
treec514ddea4da4b688c92d12f557f471c4edd1e990
parentb4161ac70e4206cc00263e0c1f765b4cf95dfd33
parent882370eaa4f7ad6a88396dfdc64f896c727f87f4
resolve ChangeLog merge conflict
ChangeLog