fix one ambiguity, and comment out a un-implemented operator

[lyx.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 7bd4461da0d1a2c7089b5c621d2b6d9b106d5e78..91d217dadf5749801ec14810834c726cbe070420 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * pariterator.h (operatir=): comment out un-implemented member
+       function. 
+
+       * paragraph.h: resolv ambiguity found by gcc 4.0 with the use of a
+       static cast.
+
 2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * lyxfont.h: include LColor.h to satisfy concept checks.