From 735441c3b83cc01457b54598238bec4c60a28a8b Mon Sep 17 00:00:00 2001
From: Chad Elliott <elliott_c@ociweb.com>
Date: Mon, 23 Feb 2015 06:35:52 -0600
Subject: Mon Feb 23 12:34:28 UTC 2015  Chad Elliott  <elliott_c@ociweb.com>

---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index fbbb9129..a673c49a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 23 12:34:28 UTC 2015  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/WorkspaceCreator.pm:
+
+          Do not completely override -value_template and -value_project
+          settings given on the actual MPC command line with workspace
+          'cmdline' settings.  They are now merged together.
+
 Thu Jan 08 07:50:12 UTC 2015  Johnny Willemsen  <jwillemsen@remedy.nl
 
         * All files:
-- 
cgit v1.2.1