Public Git Hosting - emacs.git/commit

commit	bde5e3fa83a0275bc6b54af23906fc3a8b313888
author	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 22 Aug 2016 21:38:50 +0000 (22 14:38 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 22 Aug 2016 21:38:50 +0000 (22 14:38 -0700)
tree	2f3232e658c463648621731143e696847fe8a928	tree \| snapshot (tar.gz zip)
parent	5f3aea8a10773dc481ed719034ea464573845ea1	commit \| diff
parent	66dea652ef5f5eacb7bdec23068f0b684f69956d	commit \| diff

Merge from origin/emacs-25

66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...

doc/lispref/windows.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history