* src/cff/cffload.c (cff_encoding_load): Remove unused variable.
* src/base/ftobjs.c (FT_Select_Charmap): Disallow FT_ENCODING_NONE
as argument.
diff --git a/ChangeLog b/ChangeLog
index 1aa0d7c..bc1f49a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-24 Werner Lemberg <wl@gnu.org>
+
+ * src/cff/cffload.c (cff_encoding_load): Remove unused variable.
+
+ * src/base/ftobjs.c (FT_Select_Charmap): Disallow FT_ENCODING_NONE
+ as argument.
+
2006-10-23 Zhe Su <zsu@novell.com>
* src/base/ftoutln.c (FT_Outline_Get_Orientation): Re-implement to