Merge commit 'crybaby/master'; commit 'ponder/master'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 16 Mar 2009 15:53:46 +0000 (15:53 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 16 Mar 2009 15:53:46 +0000 (15:53 +0000)
commit2d18398ae92f3da8ef49fe8e376ff5cdab53608a
tree2c93b74b2de218899da83b3886ad4992c3f99991
parent3cfdeaa9e603583f0d5745cb3211ff9b667c3428
parent1db6f8da9c563c98cfdf54e3d28d3d228cde0cb8
parentb0d8acbe46c9b30dafd08db90bda828c2862afbd
Merge commit 'crybaby/master'; commit 'ponder/master'

* commit 'crybaby/master':
  bash_profile: Extend the collection of INFOPATH directories.

* commit 'ponder/master':
  zile: Yet another editor configuration.
  emacs: Give org-iswitchb a key binding, and include diary stuff in agenda.
  emacs, dot-emacs.el: Extend and semi-automate evil-keymap hacking.
  dot-emacs.el: Insert missing blank line before section header.
bash_profile
dot-emacs.el
emacs