diff src/ChangeLog @ 4751:91f85b19749f

automatic merge
author Stephen J. Turnbull <stephen@xemacs.org>
date Tue, 17 Nov 2009 23:45:42 +0900
parents b5f21bb36684 27b09b4219b1
children b8afe0f9cbe3
line wrap: on
line diff
--- a/src/ChangeLog	Tue Nov 17 23:41:39 2009 +0900
+++ b/src/ChangeLog	Tue Nov 17 23:45:42 2009 +0900
@@ -10,6 +10,11 @@
 
 2009-11-15  Aidan Kehoe  <kehoea@parhasard.net>
 
+	* mule-ccl.c (setup_ccl_program): 
+	Fix the union build, thank you Robert Delius Royar.
+
+2009-11-15  Aidan Kehoe  <kehoea@parhasard.net>
+
 	* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
 	have a symbol in this macro.
 	(setup_ccl_program): Ensure we're not allocating unreachable