~mdw / profile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4daab0 c07e3e3)
Merge remote branch 'crybaby'
authorMark Wooding <mdw@distorted.org.uk>
Thu, 20 May 2010 13:26:24 +0000 (14:26 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 20 May 2010 13:26:24 +0000 (14:26 +0100)
* crybaby:
  dot/emacs: Turn off Senator again.
  el/dot-emacs.el: Don't use a fancy face for `which-func'.

1  2 
dot/emacs patch | diff1 | diff2 | blob | history
el/dot-emacs.el patch | diff1 | diff2 | blob | history

diff --cc dot/emacs
Simple merge
diff --cc el/dot-emacs.el
Simple merge
Dotfiles and other configuration.