X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ChangeLog;h=7bea6ea3f4422782c14c7a1bcbe0e9e900751162;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=36f798c0792aceb772fa3c1feb79f47332dac5a8;hpb=fd58a98a46a3def26b80a895f1f7b81c92590fc3;p=lilypond.git

diff --git a/ChangeLog b/ChangeLog
index 36f798c079..7bea6ea3f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-<<<<<<< ChangeLog
+2003-12-24  Han-Wen Nienhuys   <hanwen@cs.uu.nl>
+
+	* stepmake/stepmake/toplevel-targets.make: remove pfa targets
+
+	* make/lilypond.redhat.spec.in (Group): remove MAKE_PFA_FILES
+
+	* lily/mark-engraver.cc (process_music): fix mark
+	\default. (backportme)
+
+	* stepmake/stepmake/automatically-generated.sub.make (default):
+	use -n for head/tail commands. 
+
+	* lily/tie-engraver.cc (acknowledge_grob): make ties only for note
+	heads with the same pitch. (backportme)
+
 2003-12-20  Han-Wen Nienhuys   <hanwen@cs.uu.nl>
 
 	* lily/recording-group-engraver.cc (finalize): set protected_scm