chiark / gitweb /
Merge commit 'ponder'
authorMark Wooding <mdw@distorted.org.uk>
Wed, 9 Dec 2009 00:45:50 +0000 (00:45 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 9 Dec 2009 00:45:50 +0000 (00:45 +0000)
* commit 'ponder':
  dot/emacs: Tweaking for `proced'.
  bg/lovelace.jpg: New background of Ada.
  dot/emacs: Remove multihop tramp stuff.

1  2 
dot/emacs
setup

diff --cc dot/emacs
Simple merge
diff --cc setup
Simple merge