merge (2nd try -- argh git.el)

[lilypond.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 203ff58d4b13d61eb3806cb1d801d5071331dca4..709756e77674c561cac4ecb40652df187325ec97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2006-11-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * python/midi.c: 
+       init running_status
+
+       * python/midi.c: 
+       trim warning messages.
+
+       * configure.in: 
+       strip -Werror.
+
+       * input/regression/utf-8.ly: 
+       document utf-8 meaning of phrases.
+
+       * scm/define-markup-commands.scm: 
+       make \caps markup default to smallCaps
+
+       * lily/pango-font.cc: 
+       * lily/ttf.cc: 
+       use glyph indexing for glyph name .notdef
+
+2006-11-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/regression/utf-8.ly: Fix doc to match order of language
+       fonts.
+
 2006-11-01  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/optimal-page-breaking.cc (try_page_spacing): don't average