projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecc54de df0293c)
Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@ganneff.de>
Thu, 24 Apr 2014 08:33:16 +0000 (10:33 +0200)
committerJoerg Jaspert <joerg@ganneff.de>
Thu, 24 Apr 2014 08:33:16 +0000 (10:33 +0200)
* 'master' of git.ganneff.de:emacs:
  adjust notmuch-fcc-dirs and bookmarks
  fix lib name

1  2 
.emacs.d/config/emacs.org patch | diff1 | diff2 | blob | history

diff --cc .emacs.d/config/emacs.org
Simple merge
emacs