chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
162d334
9958af6
)
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
author
Mark Wooding
<mdw@distorted.org.uk>
Tue, 20 May 2008 14:35:46 +0000
(15:35 +0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Tue, 20 May 2008 14:35:46 +0000
(15:35 +0100)
* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
emacs: Turn on mark-even-if-inactive.
emacs: Add Timesheet magic.
emacs: Local configuration files.
1
2
emacs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
emacs
Simple merge