git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

author	Joakim Verona <joakim@verona.se>
	Tue, 10 Sep 2013 21:26:38 +0000 (23:26 +0200)
committer	Joakim Verona <joakim@verona.se>
	Tue, 10 Sep 2013 21:26:38 +0000 (23:26 +0200)
commit	92aeabcc8a007f521a664e3aee092eb80ad0f49a
tree	58fde2f218fa45ee1b2c67184b50137a8fb6e140	tree \| snapshot
parent	ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4	commit \| diff
parent	43aac990c339c0fc3304aa476ebc8ea8467f107e	commit \| diff

merge from trunk

Conflicts:
src/dispnew.c

Unnamed repository; edit this file 'description' to name the repository.