[LyX/master] lyx2lyx: Set last minor version of 2.1.x series

commit 847b69ea897997fada39a3a19402eb1ffbe7a3e3 Author: Scott Kostyshak Date: Mon Apr 11 20:41:23 2016 -0400 lyx2lyx: Set last minor version of 2.1.x series diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 66108dc..1e2147d 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py

[LyX/master] Update ANNOUNCE for LyX2.2.0rc1

commit 2faca4fce6208eb96a4589513cf342b6f99fdc37 Author: Scott Kostyshak Date: Mon Apr 11 20:52:47 2016 -0400 Update ANNOUNCE for LyX2.2.0rc1 diff --git a/ANNOUNCE b/ANNOUNCE index 956590e..5adb6a8 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,17 +1,16 @@ -Public release of LyX version 2.2.0be

[LyX/master] This is LyX 2.2.0rc1

commit 2ed943195fc5bd7cb3f9480f5818cdb63359b7c0 Author: Scott Kostyshak Date: Mon Apr 11 21:31:28 2016 -0400 This is LyX 2.2.0rc1 diff --git a/configure.ac b/configure.ac index fb1e49c..f11f89a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process with autoconf to gener

[LyX/master] Update acmsiggraph-0-92.layout to latest format

commit d28c4ae2c4671f1ccfd165ef18c485eff1991fb3 Author: Scott Kostyshak Date: Mon Apr 11 21:28:32 2016 -0400 Update acmsiggraph-0-92.layout to latest format diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout index 5c0ff18..5732ecc 100644 --- a/lib/layou

[LyX/master] Back to development

commit d1b3d20c43a98755c3b16e717f44da256c62d1bc Author: Scott Kostyshak Date: Mon Apr 11 21:33:21 2016 -0400 Back to development diff --git a/configure.ac b/configure.ac index f11f89a..28c7196 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process with autoconf to genera

[LyX/master] Fix dataloss when flex inset is undefined.

commit f180e813fef22dc79c0895b65d2551b0e2603a08 Author: Guillaume Munch Date: Mon Apr 11 17:33:14 2016 +0100 Fix dataloss when flex inset is undefined. Regression at cfeddb929. If a flex inset has no layout upon saving (e.g. if a module has been deleted) then its name became l

[LyX/master] Revert "AGUTeX: update layout to AGUTeX 2015 according to our new guidelines"

commit 7c3fd636469b0a7f50f3515d100d9e957cda16b9 Author: Scott Kostyshak Date: Mon Apr 11 11:30:06 2016 -0400 Revert "AGUTeX: update layout to AGUTeX 2015 according to our new guidelines" For why this reversion is being done, see: https://www.mail-archive.com/search?l=mid&q=neb

[LyX features/betterpaint] Set vertical margins in redoParagraph, not setRowHeight

The branch, betterpaint, has been updated. - Log - commit d57a233e1b194d0f8fb5e2f8942f1cf737e1711a Author: Jean-Marc Lasgouttes Date: Fri Apr 8 16:34:46 2016 +0200 Set vertical margins in redoParagraph, not setRowHeight