chiark / gitweb /
Merge remote branch 'crybaby'
authorMark Wooding <mdw@distorted.org.uk>
Thu, 18 Feb 2010 15:33:26 +0000 (15:33 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 18 Feb 2010 15:33:26 +0000 (15:33 +0000)
commit6e485064b17a5d7fbda5709d0dcd63567191407b
tree3bd861adfdf2eeba2b6cbd15574683591b578328
parent4906574e28c67cfd4dc1b53d1b09e481938878ef
parent116259a9cc62b355034279896076d2383b5f27ad
Merge remote branch 'crybaby'

* crybaby:
  dot/emacs: Support the Chrome edit server.
  dot/vimrc: Use the right font and colours.  Turn on autoindent.
  el/dot-emacs.el: Twiddle `variable-pitch' face size for Emacs 22.
dot/emacs
el/dot-emacs.el