From: fred <fred>
Date: Tue, 26 Mar 2002 22:26:36 +0000 (+0000)
Subject: lilypond-1.2.10
X-Git-Tag: release/1.5.59~2140
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=845e259675df6574ff403be5f52a9b25a079df46;p=lilypond.git

lilypond-1.2.10
---

diff --git a/flower/scalar.cc b/flower/scalar.cc
index 951f50359d..476b6485bd 100644
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include "scalar.hh"
 #include "rational.hh"
-#include "matrix.hh"
 
 Scalar::Scalar (Rational r)
 {
@@ -105,12 +104,4 @@ Scalar::to_bool () const
   return true;
 }
 
-Scalar::Scalar(Matrix const &m)
-{
-  *this = m.str ();
-}
 
-Scalar::Scalar (Vector const &v)
-{
-  *this = v.str ();
-}
diff --git a/lily/include/line-spacer.hh b/lily/include/line-spacer.hh
index ee51de4770..49bdd56e4f 100644
--- a/lily/include/line-spacer.hh
+++ b/lily/include/line-spacer.hh
@@ -11,7 +11,6 @@
 #define LINE_SPACER_HH
 #include "lily-proto.hh"
 #include "array.hh"
-#include "vector.hh"
 #include "interval.hh"
 
 /**