HCoop / bpt / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3078ffd 3c80ae8)
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 18:11:27 +0000 (11:11 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 18:11:27 +0000 (11:11 -0700)
1  2 
etc/NEWS patch | diff1 | diff2 | blob | history

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