chiark / gitweb /
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 17 Jun 2016 10:23:00 +0000 (11:23 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 17 Jun 2016 10:23:00 +0000 (11:23 +0100)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  el/dot-emacs.el: Better fontification for Ediff.
  dot/emacs: Set new variable for Python indent level.
  setup: Just symlink all of the backgrounds.
  bg/twins.jpg: The Twins: Kate and Grace Hoare, by John Everett Millais.
  dot/gnus-local.el.distorted: Changes to support later Gnus versions.

1  2 
dot/emacs

diff --cc dot/emacs
Simple merge