* lib/doc/MergedManuals.lyx

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37813 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/MergedManuals.lyx b/lib/doc/MergedManuals.lyx
index f2a189402ad7f845833074fd4891f704fab87f5b..09b9f88b26c65ec878d2ff9f63115013d2f96319 100644 (file)
--- a/lib/doc/MergedManuals.lyx
+++ b/lib/doc/MergedManuals.lyx
@@ -1,18 +1,19 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 382
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
+\lyxformat 413
 \begin_document
 \begin_header
 \textclass article
 \use_default_options false
 \maintain_unincluded_children false
 \language english
+\language_package default
 \inputencoding auto
 \fontencoding global
 \font_roman lmodern
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
@@ -20,6 +21,7 @@
 
 \graphics default
 \default_output_format default
+\output_sync 0
 \bibtex_command default
 \index_command default
 \paperfontsize default
@@ -30,11 +32,13 @@
 \use_amsmath 1
 \use_esint 1
 \use_mhchem 1
+\use_mathdots 1
 \cite_engine basic
 \use_bibtopic false
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\use_refstyle 0
 \index Index
 \shortcut idx
 \color #008000
@@ -50,6 +54,7 @@
 \tracking_changes false
 \output_changes false
 \html_math_output 0
+\html_css_as_file 0
 \html_be_strict true
 \end_header
 
@@ -149,6 +154,10 @@ filename "LFUNs.lyx"
 \end_layout
 
 \begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand include
 filename "../examples/linguistics.lyx"
@@ -158,7 +167,7 @@ filename "../examples/linguistics.lyx"
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand include
 filename "../lib/examples/xypic.lyx"
@@ -166,6 +175,11 @@ filename "../lib/examples/xypic.lyx"
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \end_body