Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commitaed22ca32344c21c5868a451d1afe969642a3ba5
authorMartin Rudalics <rudalics@gmx.at>
Mon, 22 Aug 2016 06:41:31 +0000 (22 08:41 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 22 Aug 2016 06:41:31 +0000 (22 08:41 +0200)
tree5d327ba0140e03f630da41b62da0dcb921bea70c
parentdc491c3df305a73908fe8de20b7c428a5b38c846
parent7a6b3d0fb793864a1f5deb5a22de78a4dced652d
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
src/frame.c