#       The branch, 2.0.x, has been updated

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (f1c4a8fd037019327af9cd99c56ad8da5acd6dbe)
            \
             N -- N -- N (f79fd6013e8e33a63b23deaaf62c09e9adf7b53b)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.


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

commit f79fd6013e8e33a63b23deaaf62c09e9adf7b53b
Author: Richard Heck <[email protected]>
Date:   Wed May 2 11:28:15 2012 -0400

    More re-ordering, again mostly to test emails.

diff --git a/status.20x b/status.20x
index 0285d0d..20faef7 100644
--- a/status.20x
+++ b/status.20x
@@ -94,6 +94,13 @@ What's new
 - Fix crash when clicking away in the same math inset just after hitting '\'
   (bug 8140).
 
+- Fix crash when dissolving a math macro whose first argument is another
+  parameterless macro (bug 8105).
+
+- Update the current view after dispatching a command through the lyxserver.
+  The missing screen update could cause either a failure in executing the
+  command or could even crash LyX (bugs 6871 and 8119).
+
 - Fixed assertion on selection of insets in RTL text (bug 7518).
 
 - Don't reset the selected format each time we click into a new paragraph
@@ -117,10 +124,6 @@ What's new
 - Setting a multirow offset no longer also changes table column
   alignments (bug 8084).
 
-- Fixed stray warning when inserting inserting plaintext file (bug 7916).
-
-- Fix undo warning when inserting plain text file (bug 7916).
-
 - Do not repeatedly show export errors of a previous export.
 
 - Fix the selection of rows below a multirow (bug 8083).
@@ -134,13 +137,6 @@ What's new
 
 - Made it possible to delete local layout in Document>Settings.
 
-- Fix crash when dissolving a math macro whose first argument is another
-  parameterless macro (bug 8105).
-
-- Update the current view after dispatching a command through the lyxserver.
-  The missing screen update could cause either a failure in executing the
-  command or could even crash LyX (bugs 6871 and 8119).
-
 - Improve thesaurus dialog completion (bug 8138)
 
 - Fix erroneous error message when calling "buffer-language" manually.
@@ -153,6 +149,10 @@ What's new
 
 - Fix the coloring of Quotation marks with change tracking (bug 7653).
 
+- Fixed stray warning when inserting inserting plaintext file (bug 7916).
+
+- Fix undo warning when inserting plain text file (bug 7916).
+
 
 * DOCUMENTATION AND LOCALIZATION
 

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

Summary of changes:
 status.20x |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to