chiark / gitweb /
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Tue, 20 May 2008 14:35:46 +0000 (15:35 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 20 May 2008 14:35:46 +0000 (15:35 +0100)
* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: Turn on mark-even-if-inactive.
  emacs: Add Timesheet magic.
  emacs: Local configuration files.

1  2 
emacs

diff --cc emacs
Simple merge