Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Tue, 3 Nov 2009 17:24:58 +0000 (17:24 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 3 Nov 2009 17:24:58 +0000 (17:24 +0000)
commit8ea7c4ee5a1188212c01aa81a007600d43605c7e
tree200bd3f04ba9bd4be165bf58b55cc70949aeeb9d
parentfaf2cef79a29d343c41d99a714cd9bcc8be720e2
parent38c4723941d89854a84c72251f2bc72c664d1ddf
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  dot/fonts.conf: If `Geneva' is requested, supply `FreeSans'.
  el/dot-emacs.el: Use define-derived-mode to make C# mode.
  el/dot-emacs.el: Org-mode hacking to use Strayman class.
  dot/bash_profile: Read bashrc if it's been lost.
  dot/e16-bindings: Add binding to show menu list.
dot/fonts.conf
el/dot-emacs.el