Merge from upstream.

[lilypond.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 8687dfa23c73b8b6e94e3c528394b5c43d159131..21e222f43a67a950262d7cb14f337a7d60528330 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-06  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/advanced-notation.itely: add example
+       for segno/coda on barline.
+
+       * tex/texinfo.tex: merge from upstream.
+
 2006-06-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scripts/lilypond-book.py (process_snippets): Argument fix.