chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
03f7e61
9f56284
)
Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile
author
Mark Wooding
<mwooding@good.com>
Thu, 23 Oct 2014 12:49:12 +0000
(13:49 +0100)
committer
Mark Wooding
<mwooding@good.com>
Thu, 23 Oct 2014 12:49:12 +0000
(13:49 +0100)
* 'master' of http://git.distorted.org.uk/~mdw/profile:
bg/lilith.jpg: New image; painting by John Collier.
dot/bashrc: Some hacking for Sailfish.
Trivial merge