chiark / gitweb /
Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile
authorMark Wooding <mwooding@good.com>
Thu, 23 Oct 2014 12:49:12 +0000 (13:49 +0100)
committerMark Wooding <mwooding@good.com>
Thu, 23 Oct 2014 12:49:12 +0000 (13:49 +0100)
commit21237a6865c473d89123b9649988dd610ee89074
tree0da25bdd75e034e8cc67f64a7461629d3d42c032
parent03f7e611ae3208e41ee76bfa59d3fee0a772eefd
parent9f56284f690e860ccf3b15490805d8fc84822a1d
Merge branch 'master' of git.distorted.org.uk/~mdw/profile

* 'master' of http://git.distorted.org.uk/~mdw/profile:
  bg/lilith.jpg: New image; painting by John Collier.
  dot/bashrc: Some hacking for Sailfish.