HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
16a9114
9acd1bd
)
merge from trunk, no conflicts
author
Joakim Verona
<joakim@verona.se>
Wed, 18 Aug 2010 11:11:01 +0000
(13:11 +0200)
committer
Joakim Verona
<joakim@verona.se>
Wed, 18 Aug 2010 11:11:01 +0000
(13:11 +0200)
1
2
etc/NEWS
patch
|
diff1
|
diff2
|
blob
|
history
lisp/image.el
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
etc/NEWS
Simple merge
diff --cc
lisp/image.el
Simple merge