From: fred <fred>
Date: Sun, 24 Mar 2002 19:53:35 +0000 (+0000)
Subject: lilypond-0.1.7
X-Git-Tag: release/1.5.59~4130
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9008bdd54431fb1155a30be8721daac1faffa386;p=lilypond.git

lilypond-0.1.7
---

diff --git a/lily/VERSION b/lily/VERSION
index 013490db64..c04453cdaa 100644
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 1
+PATCH_LEVEL = 7
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 
diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 3891a5a0c1..162c5fe385 100644
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -10,14 +10,17 @@
 #ifndef COLLISION_HH
 #define COLLISION_HH
 #include "lily-proto.hh"
-#include "item.hh"
+#include "elem-group-item.hh"
 
-/** TODO 
+/**
+  Resolve conflicts between various Note_columns (chords).
+  
+  TODO 
 
   multistaff support (see Chlapik: equal noteheads should be on the
   same hpos.)  
 */
-class Collision : public Item {
+class Collision : public Horizontal_vertical_group_item {
 protected:
     virtual void do_substitute_dependency(Score_elem*,Score_elem*);
     virtual void do_pre_processing();
@@ -26,6 +29,5 @@ public:
     DECLARE_MY_RUNTIME_TYPEINFO;
     void add (Note_column*ncol_l);
     Collision();
-    
 };
 #endif // COLLISION_HH