chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9850239
955a327
)
Merge remote branch 'crybaby'
author
Mark Wooding
<mdw@distorted.org.uk>
Wed, 31 Mar 2010 09:13:14 +0000
(10:13 +0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Wed, 31 Mar 2010 09:13:14 +0000
(10:13 +0100)
* crybaby:
dot/emacs: Mark the `edit-server' process as expendable.
1
2
dot/emacs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dot/emacs
Simple merge