From: Richard Heck <rgheck@lyx.org>
Date: Mon, 25 Jul 2016 18:55:16 +0000 (-0400)
Subject: Merge branch '2.2.x' into 2.2.2-staging
X-Git-Tag: 2.2.2~110
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=46a16b0ca778ed32f7aa0cbc6c4d6d57f1270b98;p=features.git

Merge branch '2.2.x' into 2.2.2-staging
---

46a16b0ca778ed32f7aa0cbc6c4d6d57f1270b98
diff --cc status.22x
index 7c186110b0,0e9f06d6ee..a6d4801d73
--- a/status.22x
+++ b/status.22x
@@@ -18,12 -18,11 +18,12 @@@ What's ne
  * TEX2LYX IMPROVEMENTS
  
  
 -
  * USER INTERFACE
  
 +* When changing zoom level, show current value in status bar (bug
 +  10212).
  
--
++  
  * DOCUMENTATION AND LOCALIZATION
  
  
@@@ -45,19 -43,9 +45,23 @@@
  
  * USER INTERFACE
  
 +- Avoid crashing in release mode if we stumble across an unrealized font.
  
 -* INTERNALS
 +- Fix display of citations with two authors.
 +
 +- Fix display of multi-author citations when the GUI language is not English.
  
 +- Fix bug where change tracking marks are lost under math insets (bug
 +  10265).
 +
 +- Fix display glitch when switching to Description layout with an inset
 +  at the beginning of the paragraph (bug 10163)
 +
++
++* USER INTERFACE
++
++
 +* INTERNALS
  
  
  * DOCUMENTATION AND LOCALIZATION
@@@ -69,7 -57,7 +73,6 @@@
  * TEX2LYX
  
  
--
  * ADVANCED FIND AND REPLACE