code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

author	Phillip Lord <phillip.lord@russet.org.uk>
	Thu, 12 Nov 2015 22:01:22 +0000 (22:01 +0000)
committer	Phillip Lord <phillip.lord@russet.org.uk>
	Thu, 12 Nov 2015 22:01:22 +0000 (22:01 +0000)
commit	20aa42e8204f8f0139ba3880cb32ddf88acc9bf4
tree	f77644c920b0f6a5a2f5849a064c6828c17530b1	tree
parent	d2f73db50bec29724cb1324910350ad24420b174	commit \| diff
parent	44dfa86b7d382b84564d68472da1448d08f48129	commit \| diff

; Merge branch 'fix/no-undo-boundary-on-secondary-buffer-change'

Conflicts:
src/cmds.c
src/keyboard.c