1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5969d5726fb..33a5802ce47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-12-10  Daniel Colascione  <dancol@dancol.org>
+        * .bzrignore: add src/emacs.res.
        * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
        build how to compile Windows resource files; use these variables
        to tell src/Makefile.in how and whether to compile resources.

diff --git a/ChangeLog b/ChangeLog index 5969d5726fb..33a5802ce47 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -1,5 +1,7 @@
1	2012-12-10 Daniel Colascione <dancol@dancol.org>	1	2012-12-10 Daniel Colascione <dancol@dancol.org>
2		2
		3	* .bzrignore: add src/emacs.res.
		4
3	* configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32	5	* configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
4	build how to compile Windows resource files; use these variables	6	build how to compile Windows resource files; use these variables
5	to tell src/Makefile.in how and whether to compile resources.	7	to tell src/Makefile.in how and whether to compile resources.