From 4fe59f9f23d8aff1bcd86b5101487ae82efa5f25 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Mon, 1 Sep 2014 11:38:01 +0400 Subject: [PATCH] LyX format updated to 474 (>=LyX-2.0.8). --- git-tutorial.lyx | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/git-tutorial.lyx b/git-tutorial.lyx index e6e061a..cb20a61 100644 --- a/git-tutorial.lyx +++ b/git-tutorial.lyx @@ -1,5 +1,5 @@ -#LyX 2.0 created this file. For more info see http://www.lyx.org/ -\lyxformat 413 +#LyX 2.1 created this file. For more info see http://www.lyx.org/ +\lyxformat 474 \begin_document \begin_header \textclass article @@ -36,13 +36,13 @@ foottoend \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 \font_tt_scale 100 - \graphics default \default_output_format default \output_sync 0 @@ -66,15 +66,24 @@ foottoend \pdf_pdfusetitle true \papersize default \use_geometry true -\use_amsmath 1 -\use_esint 1 -\use_mhchem 1 -\use_mathdots 1 +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\use_package mathtools 1 +\use_package mhchem 1 +\use_package stackrel 1 +\use_package stmaryrd 1 +\use_package undertilde 1 \cite_engine basic +\cite_engine_type default +\biblio_style plain \use_bibtopic false \use_indices false \paperorientation portrait \suppress_date false +\justification true \use_refstyle 1 \index Index \shortcut idx @@ -700,7 +709,7 @@ status collapsed \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout \begin_inset CommandInset label @@ -2637,7 +2646,7 @@ status collapsed \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout \begin_inset CommandInset label @@ -2799,7 +2808,7 @@ status collapsed \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout Децентрализованный, но централизованный @@ -2857,7 +2866,7 @@ status collapsed \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout Главные ветви @@ -2990,7 +2999,7 @@ status collapsed \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout Ветви функциональностей (feature branches) @@ -3128,7 +3137,7 @@ status collapsed \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout no-fast-forward VS fast-forward @@ -3409,7 +3418,7 @@ status collapsed \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout Ветви исправлений (hotfix branches)