chiark / gitweb /
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 9 May 2008 21:22:37 +0000 (22:22 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 9 May 2008 21:22:37 +0000 (22:22 +0100)
commit3dbf05efefb880a79fb340a591d02bcf6b47234a
tree70b63e471fd8691923e1cef0231c1b8b56a7a928
parent133cf81dabe349af05c3d2efc44910a3685e4209
parent5f21ac4f43be3bf9571e67d0f0cccf7bd8dd5db7
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: Add key bindings for timeclock functions.

Conflicts:

emacs: two independent lots of keybindings in the same place
emacs