*** empty log message ***

[lilypond.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 114388c30023f21ed723bb6bd497833b5dff2b5e..1c6715ee6bb8daa4e1293bab973ca3c6b6594dff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+
+
+2005-06-06  Carl Sorensen  <carldsorensen@comcast.net>
+
+       * input/regression/fret-diagrams.ly: new file to test fret diagram
+             capability
+
+       * scm/output-tex.scm: remove white-dot and white-text
+
+       * scm/output-ps.scm: remove white-dot and white-text
+
+       * scm/fret-diagrams.scm (sans-serif-stencil-white): removed -- 
+            using ly:stencil-in-color instead
+                               (draw-dots) : remove call to white-dot
+
 2005-06-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * flower/memory-stream.cc (Memory_out_stream): remove fopencookie support.
@@ -7,7 +22,7 @@
        * flower/include/file-cookie.hh: new file. lily_cookie extension 
 
        * flower/file-cookie.cc: new file. lily_cookie extension.
-
+       
 2005-06-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/editor.scm (editor-command-template-alist): Add syn
@@ -244,6 +259,7 @@
        * Documentation/pictures/GNUmakefile (OUT_DIST_FILES): Add ly-icon
        rules.
 
+>>>>>>> 1.3718
 2005-05-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/stencil-scheme.cc (LY_DEFINE): ly:stencil-in-color