The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit b674c190e79c08e0549cfcf7b2d5904ac99f8ac7
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Mon Jul 16 23:11:26 2012 +0200

    Make the toolbar code less noisy when the session file is not found
    
    Conflicts:
    
        src/frontends/qt4/GuiToolbar.cpp

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 79e669f..73ff2a1 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -358,7 +358,7 @@ void GuiToolbar::restoreSession()
                settings.value(sessionKey() + "/visibility", error_val).toInt();
        if (visibility == error_val || visibility == 0) {
                // This should not happen, but in case we use the defaults
-               LYXERR0("Session settings could not be found!. "
+               LYXERR(Debug::GUI, "Session settings could not be found!. "
                        "Defaults are used instead");
                visibility = 
                        
guiApp->toolbars().defaultVisibility(fromqstr(objectName()));
diff --git a/status.20x b/status.20x
index 0b0878d..d4414dc 100644
--- a/status.20x
+++ b/status.20x
@@ -108,6 +108,7 @@ What's new
 - Fix problem with configure.py when the user profile path on Windows
   contains non-ascii characters (bug 8254).
 
+- remove annoying startup debug message.
 
 * DOCUMENTATION AND LOCALIZATION
 

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiToolbar.cpp |    2 +-
 status.20x                       |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to