Merge remote-tracking branch 'ponder/master'
authorMark Wooding <mdw@distorted.org.uk>
Fri, 11 Nov 2011 17:57:13 +0000 (17:57 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 11 Nov 2011 17:57:13 +0000 (17:57 +0000)
* ponder/master:
  dot/emacs: Fix awful calendar snafu.
  el/dot-emacs.el: Define org-mode variables to make Docbook output work.
  dot/e16-bindings: New bindings for fiddling with window opacity.

1  2 
dot/emacs

diff --cc dot/emacs
Simple merge