From 5d21819954e80e0cc8fb7f7ae86941618ff4d9ac Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Sat, 30 Oct 2010 05:59:54 +0000
Subject: Fix ChangeLog conflict?

---
 muse2/ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'muse2/ChangeLog')

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 55ab4233..c448ff5c 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,6 +1,10 @@
+30.10.2010
+        - Fixed Deicsonze crash and missing Organ. Both load now. (Tim.)
 27.10.2010
         - Fixed drawing of Slider widget and Meter widget (rj)
         - Fixed keyboard shortcuts for tools on toolbar (rj)
+        - More conversions with windows done previously done, fixes. Marker, Master gui + List. (Tim)
+          Some new style header fixes here/there. 
 26.10.2010  
         - Fixed non-opening view menu windows (mixers, marker, bigtime etc). (Tim)
           Found all the isItemChecked() returning opposite of before (for example in toggleBigTime()). 
-- 
cgit v1.2.3