* lily/new-slur.cc: Resolve conflicts.

[lilypond.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2de7714c4705d092dc300583fc5533e24c9848e9..e565c3c5ed7454f71714236e3e810bc809e22acd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2004-07-18  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/new-slur.cc: Resolve conflicts.
+
+       * lily/stem-engraver.cc (add_script):
+       (make_stem): New method.
+
+       * lily/include/script-interface.hh:
+       * lily/script-interface.cc: New file.
+
+       * lily/include/script.hh:
+       * lily/script.cc: Remove.
+
+       * lily/music.cc (duration_log): New method.
+
+       * lily/script.cc (struct Skript): Remove.
+
+       * lily/new-slur.cc (get_base_attachments): Try at articulations.
+       Lots of coding cleanups (Stom).
+
 2004-07-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/new-slur.cc (avoid_staff_line): new function: avoid