diff src/ChangeLog @ 5024:7e57c0575a15

merge
author Ben Wing <ben@xemacs.org>
date Tue, 09 Feb 2010 19:34:19 -0600
parents 838630c0734f
children 680ca8de98a3
line wrap: on
line diff
--- a/src/ChangeLog	Tue Feb 09 19:13:44 2010 -0600
+++ b/src/ChangeLog	Tue Feb 09 19:34:19 2010 -0600
@@ -341,6 +341,14 @@
 	GET_VOID_FROM_LISP to make sure the same value comes back that
 	was put in.
 
+2010-02-09  Vin Shelton  <acs@xemacs.org>
+
+	* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
+	Declare hfont at start of a code block.
+
+	* glyphs-eimage.c: Undefine and then redefine FAR around the jpeg
+	header.
+
 2010-02-08  Vin Shelton  <acs@xemacs.org>
 
 	* nt.c (open_unc_volume): lpRemoteName is an XELPTSTR.