chiark / gitweb /
~mdw / profile / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 415a23d 79ba2d3)
Merge remote branches 'ponder' and 'crybaby'
authorMark Wooding <mdw@distorted.org.uk>
Sun, 20 Dec 2009 22:58:29 +0000 (22:58 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 20 Dec 2009 22:58:29 +0000 (22:58 +0000)
commit4983780af98c0465162b06554cd55ffcd213cfcd
tree3e3d6ae3e623d8d7bf01f1a5f98be0aca22cc657tree | snapshot
parent415a23dd3faaee25d7f28be55208eea0cbb78e21commit | diff
parent79ba2d3537913b2f1aef104fb43b7c2c20eb0781commit | diff
Merge remote branches 'ponder' and 'crybaby'

* ponder:
  el/dot-emacs.el: Aliases for `eshell'.
  el/dot-emacs.el: Remove menu bar from dumb terminals.
  el/dot-emacs.el: Remove stray debugging code.
  el/dot-emacs.el: Emacs 22 doesn't have `whitespace-mode'.
  dot/bash_profile: Use Perforce configuration files.

* crybaby:
  emacs: Yet another spelling of `git' in `vc-handled-backends'.
  el/dot-emacs.el: Clobber `comint-highlight-input' properly.
dot/emacs diff1 | diff2 | blob | history
el/dot-emacs.el diff1 | diff2 | blob | history
Dotfiles and other configuration.