]> git.eshelyaron.com Git - emacs.git/commit
fix conflicts
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 06:44:18 +0000 (08:44 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 06:44:18 +0000 (08:44 +0200)
commit95227d0882184659bfe4e1322a3b9e246e145f0b
tree8bb01cc3621db8ef44658bf197c9ae37c5cd8c00
parenta41d9dcfc950458c081f832606dac2081d14c8ae
fix conflicts
lisp/ibuffer.el
lisp/mail/rmail.el
src/emacsgtkfixed.h