Mercurial > ecos

diff host/libcdl/ChangeLog @ 110:84e4bde58b26 ecos-sw-2000-07-14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from eCos master repository on 2000-07-14-22:00:02-BST
author jlarmour
date Mon, 17 Jul 2000 14:42:27 +0000
parents ff3f181b64bd
children 6ed91473a1cd
line wrap: on
line diff
--- a/host/libcdl/ChangeLog
+++ b/host/libcdl/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-06  Bart Veer  <bartv@redhat.com>
+
+	* conflict.cxx (get_explanation):
+	Put quotes around "requires" in the conflict explanation.
+	Requested by the eCos team.
+
 2000-07-04  Bart Veer  <bartv@redhat.com>
 
 	* value.cxx (save):