Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Tue, 26 Feb 2008 17:50:21 +0000 (17:50 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 26 Feb 2008 17:50:21 +0000 (17:50 +0000)
* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emerge-hack: A new script for Git merging.
  vncrc, xinitrc: Don't do so much Gnome fiddling.
  dot-emacs: Fiddle C indentation settings.
  emacs: Make postscript printing more sensible.

1  2 
dot-emacs.el

diff --cc dot-emacs.el
Simple merge