support for sidewaysfloats and fix for bug 1016 (float placement allows impossible...

[features.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 6a6e39b49d9d908c74d205a4f8fa7322542f7b1e..29affcef39e16e3dc5519ca5bd2fa2940517170e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,6 @@
+2004-03-29  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * buffer.C: increment file format to 231.
 
 2004-03-28  Alfredo Braunstein  <abraunst@lyx.org>
 
@@ -221,6 +224,7 @@
        * lyxrc.C (setDefaults, getDescription, output, read):
        * lyxrc.h: remove ps_command
 
+>>>>>>> 1.1856
 2004-03-22  Angus Leeming  <leeming@lyx.org>
 
        * lyx_main.C (error_handler, init): remove handler for SIGPIPE.