chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
5f454d3
580ac7c
)
Merge remote-tracking branch 'origin'
author
Mark Wooding
<mdw@distorted.org.uk>
Tue, 3 May 2016 16:27:17 +0000
(17:27 +0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Tue, 3 May 2016 16:27:17 +0000
(17:27 +0100)
* origin:
dot/ipython_config.py: Let's just have one of these for everywhere.
Trivial merge