chiark / gitweb /
~mdw / profile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 423716a 403dc17)
Merge remote branch 'ponder'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 12 Apr 2010 18:32:29 +0000 (19:32 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 12 Apr 2010 18:32:29 +0000 (19:32 +0100)
* ponder:
  setup, pulseaudio, git: Add PulseAudio configuration; substituted dotfiles.

1  2 
setup patch | diff1 | diff2 | blob | history

diff --cc setup
Simple merge
Dotfiles and other configuration.