]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc491c3 7a6b3d0)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMartin Rudalics <rudalics@gmx.at>
Mon, 22 Aug 2016 06:41:31 +0000 (08:41 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 22 Aug 2016 06:41:31 +0000 (08:41 +0200)
1  2 
src/frame.c patch | diff1 | diff2 | blob | history

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