summaryrefslogtreecommitdiff
path: root/ACE/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ChangeLog')
-rw-r--r--ACE/ChangeLog21
1 files changed, 21 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 3e4daaf240f..64b2fadda5f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,24 @@
+Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl>
+
+ Merged changes from Remedy work branch.
+
+ === start changelog ===
+
+ Tue Oct 18 09:23:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+ * bin/MakeProjectCreator/config/global.features:
+ Add ccm_direct_collocation
+
+ Wed Oct 12 13:08:13 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * bin/MakeProjectCreator/config/crosscompile.mpb:
+ Fixed install issues.
+
+ * bin/mwc.pl:
+ Removed unnecessary STDERR.
+
+ === end changelog ===
+
Thu Oct 20 06:57:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* *.*: