projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: beed63a 23cc54e)
Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Thu, 15 Oct 2015 20:31:44 +0000 (22:31 +0200)
committerJoerg Jaspert <joerg@debian.org>
Thu, 15 Oct 2015 20:31:44 +0000 (22:31 +0200)
* 'master' of git.ganneff.de:emacs:
  Add corral, fix tramp
  Add wgrep
  Merge

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

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