[LyX/master] Add tex2lyx test for verbatim*

commit 8ac43f2e0465f15d336a8910c8fdf0e5f8b07fbe Author: Georg Baum Date: Fri Nov 27 20:30:41 2015 +0100 Add tex2lyx test for verbatim* diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx index 4a43049..d5732c1 100644 ---

[LyX/master] Simplify logic

commit 5c35ebcd2488119b1041c5cea9cdd8bdc1a6d710 Author: Georg Baum Date: Fri Nov 27 20:35:13 2015 +0100 Simplify logic The old code was more complicated than needed, we have unstarred_name to make our live easier. The test proves that the new code works as

[LyX/master] Update format of bind and ui files.

commit 1bf01a8ad307729fa486563d600ba9d8c2320368 Author: Richard Heck Date: Fri Nov 27 11:56:17 2015 -0500 Update format of bind and ui files. diff --git a/lib/bind/aqua.bind b/lib/bind/aqua.bind index 7ac1bb6..8ce7945 100644 --- a/lib/bind/aqua.bind +++

[LyX/master] Cmake export tests: Implemented multiple sublabels for each test.

commit 4138ab79167e840aa53bd7cfed0095b0c6d8c0d6 Author: Kornel Benko Date: Fri Nov 27 15:12:47 2015 +0100 Cmake export tests: Implemented multiple sublabels for each test. diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake index

[LyX/master] UserGuide.lyx and Math.lyx: update version number

commit 695399b062441aceb9c3a1fb29fbe18edf6ba55c Author: Uwe Stöhr Date: Sat Nov 28 03:23:38 2015 +0100 UserGuide.lyx and Math.lyx: update version number diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 83c4dad..ca1bb4d 100644 --- a/lib/doc/Math.lyx +++

[LyX/master] installer: remove residues of metafile2eps

commit 764cc2be1f6a56d946235f1ed7804601df829a16 Author: Uwe Stöhr Date: Sat Nov 28 02:04:57 2015 +0100 installer: remove residues of metafile2eps diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh

[LyX/master] Customization.lyx: accept some changes

commit 2e5ab40276a79cfa2578446ca87c1720728e9bc1 Author: Uwe Stöhr Date: Sat Nov 28 03:13:11 2015 +0100 Customization.lyx: accept some changes diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index d90a3d5..c6121df 100644 --- a/lib/doc/Customization.lyx

[LyX/master] LaTeXConfig.lyx: accept changes

commit ab1f3213e839973804dbbbede90139782632c5cd Author: Uwe Stöhr Date: Sat Nov 28 03:15:45 2015 +0100 LaTeXConfig.lyx: accept changes - also add hpstatement module and remove the deprecated rsphrase module (this module is only kept for compatibility reasons)

[LyX/master] Small fixes to export test documentation.

commit 960393b7a06b60f8504b7b0836e05184d5d679c1 Author: Günter Milde Date: Fri Nov 27 10:33:12 2015 +0100 Small fixes to export test documentation. diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx index 581ebee..3cb4d8b 100644 --- a/lib/doc/Development.lyx +++

[LyX/master] Back to development

commit 7657562265d15be1233b6ef5ce3db91ca5f9777c Author: Scott Kostyshak Date: Fri Nov 27 03:25:49 2015 -0500 Back to development diff --git a/configure.ac b/configure.ac index 6ce797a..561a03f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process with

[LyX/master] This is LyX 2.2.0alpha2

commit 5c717f46c43292bdf9b53f5f3865bf229b69e147 Author: Scott Kostyshak Date: Fri Nov 27 03:23:23 2015 -0500 This is LyX 2.2.0alpha2 diff --git a/configure.ac b/configure.ac index d82fcaa..6ce797a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process

[LyX/master] Update ANNOUNCE for 2.2.0alpha2

commit b6116fe0ef7b4af03f402d9dc48ede0166884a95 Author: Scott Kostyshak Date: Fri Nov 27 02:59:19 2015 -0500 Update ANNOUNCE for 2.2.0alpha2 diff --git a/ANNOUNCE b/ANNOUNCE index 72bb494..50992ed 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,17 +1,17 @@ -Public release of

[LyX/master] updatedocs.py: remove an extra parenthesis

commit 09bdea3c0218c3cfcc95cac461b6dae559bd94a7 Author: Scott Kostyshak Date: Fri Nov 27 02:37:27 2015 -0500 updatedocs.py: remove an extra parenthesis diff --git a/development/tools/updatedocs.py b/development/tools/updatedocs.py index 902248a..a912680 100644 ---