projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28b6093 ba23003)
Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Fri, 20 Feb 2015 22:33:28 +0000 (23:33 +0100)
committerJoerg Jaspert <joerg@debian.org>
Fri, 20 Feb 2015 22:33:28 +0000 (23:33 +0100)
* 'master' of git.ganneff.de:emacs:
  add golden ratio mode

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

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