Merge branch 'master' of metalzone:etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Mon, 12 Apr 2010 23:27:48 +0000 (00:27 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 12 Apr 2010 23:27:48 +0000 (00:27 +0100)
* 'master' of metalzone:etc/profile:
  dot/xinitrc: Punt a bunch of application startup stuff to `gnome-session'.
  setup, pulseaudio, git: Add PulseAudio configuration; substituted dotfiles.
  dot/emacs: Twiddle `{shell,comint}-file-name-chars'.
  bin/mdw-build: Insert missing space.

1  2 
dot/xinitrc

diff --cc dot/xinitrc
Simple merge