cvs merge.

diff --git a/ChangeLog b/ChangeLog
index 41df0df108a3e8a2e09fdc1065fb7f0e8e1845ab..88f2ccac75495277448d768488c3433f3880c8a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+2006-11-07  Erlend Aasland  <erlenda@gmail.com>
+
+       * scm/music-function.scm (add-ballon-text): add FIXME comment.
+
+       * scm/define-grob-properties.scm: remove old balloon stuff,
+       and do some trivial beautification.
+
+2006-11-06  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+       * scm/music-functions.scm (markup-expression->make-markup): fix
+       the case when a markup found in a markup list is a simple
+       string (Issue #147).
+
+2006-11-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/instrument-name-engraver.cc: 
+       * input/regression/instrument-name-dynamic.ly: 
+       ignore dynamic and pedal line spanners.
+
+       * Documentation/topdocs/NEWS.tely: 
+       * Documentation/user/advanced-notation.itely: 
+       * THANKS: 
+       * input/regression/balloon.ly: 
+       * lily/balloon.cc: 
+       * ly/music-functions-init.ly: 
+       * scm/define-event-classes.scm: 
+       * scm/define-grobs.scm: 
+       * scm/define-music-properties.scm: 
+       * scm/define-music-types.scm: 
+       * scm/output-lib.scm: 
+       * lily/balloon-engraver.cc: 
+       rewrite balloon-text support. This is now a separate grob, with itsvictim as the parent. This involves addingBalloon_engraver, AnnotateOutputEvent, annotate-output-event,\balloonText, \balloonGrobText, and modifying Balloon_interface::print.
+
+       * lily/paper-score.cc: 
+       remove progress again
+
+       * lily/chord-name-engraver.cc: 
+       formatting nitpicks.
+
+       * lily/paper-score.cc: 
+       some useless statistics.
+
+       * buildscripts/git-update-changelog.py: 
+       update todo/done after rejection due to removal analysis.
+
+       * buildscripts/git-update-changelog.py: 
+       check whether removals from a diff actually apply.
+
 2006-11-05  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/include/page-turn-page-breaking.hh: remove unused

diff --git a/THANKS b/THANKS
index c2eeb461e19774b3e4a36747d8def8134ea74e38..ac5930be79ccc37d64159466a31e4a55c1bc7d2f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -6,7 +6,7 @@ DEVELOPMENT TEAM
 
 Han-Wen Nienhuys  - Core development
 Jan Nieuwenhuizen - Core development
-Graham Percival   - Documentation Editor
+Graham Percival   - Documentation Editor and Bug Meister
 Mats Bengtsson    - Support Guru 
 
 
@@ -102,6 +102,8 @@ Trevor Bača
 Trevor Daniels
 Vaclav Smilauer
 Vicente Solsona Dellá
+Victor Eijkhout
+Villum Sejersen
 Werner Lemberg
 Will Oram
 Zoltan V. Laszlo