Fix defaultFont problems (bug 2308)

[lyx.git] / development / ChangeLog

diff --git a/development/ChangeLog b/development/ChangeLog
index dc1820f8584eb79a8b93ee6271a5e4838b89544c..5e8846c1fbbccf5fd2ab9fec6bdade60447fe134 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,11 +1,20 @@
+2006-02-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * MacOSX/LyX.app/Contents/Resources/preferences: move here. the
+       LyX subdirectory has not been updated; update the prefs for 1.4.0.
+
+2006-02-02  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * FORMAT: document branches
+
 2006-02-01  Bennett Helm  <bennett.helm@fandm.edu>
 
-       * MacOSX/LyX.app/Contents/Resources/preferences: update again.
+       * MacOSX/LyX.app/Contents/Resources/LyX/preferences: update again.
        Something went wrong.
 
 2006-1-12  Bennett Helm  <bennett.helm@fandm.edu>
 
-       * MacOSX/LyX.app/Contents/Resources/preferences: update formats
+       * MacOSX/LyX.app/Contents/Resources/LyX/preferences: update formats
        section to conform to lyx-1.4 conventions
 
 2005-10-13  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>