From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 18 Jul 2004 22:47:02 +0000 (+0000)
Subject: (EXTRA_DIST_FILES): Add SConstruct.
X-Git-Tag: release/2.3.7~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e05ca913d35a7bf6936cad189c7056bfd84b8fa4;p=lilypond.git

(EXTRA_DIST_FILES): Add SConstruct.
---

diff --git a/ChangeLog b/ChangeLog
index 0dcbb76c6d..d5e24b7081 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* GNUmakefile.in (EXTRA_DIST_FILES): Add SConstruct.
+
 2004-07-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* make/ly-vars.make (EXTRA_DIST_FILES): 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7160e393a6..d4e8ae5ebe 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -23,8 +23,8 @@ README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
 PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
-EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \
-  $(PATCH_FILES) 
+EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
diff --git a/lily/slur-quanting.cc b/lily/slur-quanting.cc
index ba4c56b8e5..74b18ce611 100644
--- a/lily/slur-quanting.cc
+++ b/lily/slur-quanting.cc
@@ -73,7 +73,7 @@ struct Slur_score_parameters
   - better scoring.
   - short-cut: try a smaller region first.
   - collisions with accidentals
-  - collisions with scripts (staccato!)
+  - collisions with articulations (staccato, portato, sforzato, ...)
   - 
 */
 struct Encompass_info