code.delx.au - gnu-emacs/commit

author	Daniel Colascione <dancol@dancol.org>
	Mon, 10 Dec 2012 20:55:02 +0000 (12:55 -0800)
committer	Daniel Colascione <dancol@dancol.org>
	Mon, 10 Dec 2012 20:55:02 +0000 (12:55 -0800)
commit	5b55e0b70f89dee84f6550e66267358a0a96d6b8
tree	e5ed6d18e40a302137823b60967bbc0e9bdd00f6	tree
parent	7e77303ee5dc44594747e9c41688dd3273de7ea7	commit \| diff
parent	9ca3e73ac3de6ba4842bfd6a4f62d416f9dc19b1	commit \| diff

Merge from private trunk

Daniel Colascione 2012-12-10 Add emacs.res to .bzrignore
Daniel Colascione 2012-12-10 Fix cygw32 build break