Merge remote branch 'ponder'
authorMark Wooding <mdw@distorted.org.uk>
Thu, 3 Jun 2010 20:25:21 +0000 (21:25 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 3 Jun 2010 20:25:21 +0000 (21:25 +0100)
commitbe325acf70bdbded6d86aa491720d39657fd2e73
tree2bef6caddb30cf3ed0f6335732c9084e03691101
parentc70b4880bd12cb736dc0ac27b9922704a5cbde49
parent16932f07aee688399c0f15bee9a793fc308850a4
Merge remote branch 'ponder'

* ponder:
  dot/Xdefaults: Add more Xft settings.
  el/dot-emacs.el: Configure dired faces.
  el/dot-emacs.el: Don't turn on outline-minor-mode all the time.
  dot/emacs: Remove lots of minor-mode verbiage.
dot/emacs