From a334344b33b388f09b5336ce3bcad3525462a528 Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Mon, 27 Dec 2010 03:01:31 +0000
Subject: Merged changes from ccherrett into pianroll (h-splittter).

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

(limited to 'muse2/ChangeLog')

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 2bd93b25..b4d0b7c1 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -15,6 +15,7 @@
         - Remove rem'd preview code in filedialog.cpp. I reimplemented it in appearance.cpp. (Orcan)
         - Remove the environment variables info from the usage output. (Orcan)
         - midiedit links to ctrl. (Orcan)
+        - Merged changes from ccherrett into pianroll (h-splittter). (Tim)
 26.12.2010:
         - Initial addition of midi track info to pianoroll. WORK IN PROGRESS. (Tim)
           TODO: Just to get off the hard drive. A few things still need to be linked up!
-- 
cgit v1.2.3