chiark / gitweb /
Merge remote-tracking branches 'distorted/master' and 'ponder/master'
authorMark Wooding <mdw@distorted.org.uk>
Sat, 25 Jun 2011 13:25:49 +0000 (14:25 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 25 Jun 2011 13:25:49 +0000 (14:25 +0100)
commita33d1f8ca747f70deefcd57d2d51876a0f6f9c1c
tree001076d497b5ba488f94b022ebefa6ff393218af
parent2b5d45809130a620dfd27d640d9f75d2bd71b877
parent8114097dfd0938be524b6171d73b2193d76e7b79
Merge remote-tracking branches 'distorted/master' and 'ponder/master'

* distorted/master:
  bin/mdw-conf, dot/bashrc, setup: Portability fixes.

* ponder/master:
  dot/lisp-init.lisp: Make sure that ASDF is available.