Formatting, reformulations.
diff --git a/ChangeLog b/ChangeLog
index e9f86a8..ecad073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,15 @@
2007-05-28 David Turner <david@freetype.org>
- * src/cff/cffgload.c: do not apply the font transform to loaded glyph
- if it is the identity. this cuts a significant percent of CFF glyph
- loading time
+ * src/cff/cffgload.c (cff_slot_load): Do not apply the identity
+ transformation. This significantly reduces the loading time of CFF
+ glyphs.
- * docs/CHANGES: updating
+ * docs/CHANGES: Updated.
- * src/autofit/afglobal.c: change default hinting script to
- CJK, since it works well with a larger array of scripts. thanks to
- "Rahul Bhalerao" <b.rahul.pm@gmail.com> for pointing this out !
+ * src/autofit/afglobal.c (AF_SCRIPT_LIST_DEFAULT): Change default
+ hinting script to CJK, since it works well with more scripts than
+ latin. Thanks to Rahul Bhalerao <b.rahul.pm@gmail.com> for pointing
+ this out!
2007-05-25 Werner Lemberg <wl@gnu.org>
@@ -24,7 +25,6 @@
* src/truetype/ttobjs.c (tt_size_ready_bytecode)
[!TT_USE_BYTECODE_INTERPRETER]: Removed. Unused.
->>>>>>> 1.1589
2007-05-22 David Turner <david@freetype.org>
* src/truetype/ttgload.c (load_truetype_glyph): Fix last change to