HCoop / bpt / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1f367f c2216f8)
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:34:49 +0000 (18:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:34:49 +0000 (18:34 -0700)
1  2 
src/ChangeLog patch | diff1 | diff2 | blob | history

diff --cc src/ChangeLog
Simple merge
Unnamed repository; edit this file 'description' to name the repository.