From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 26 Feb 2008 17:50:21 +0000 (+0000)
Subject: Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/56c3a7e735236be7ff43f95fe1a001f5245cdd81?ds=inline

Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* '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.
---

56c3a7e735236be7ff43f95fe1a001f5245cdd81