X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcin-manual-latex.git;a=blobdiff_plain;f=CinelerraGG_Manual.tex;h=6a49bea1fff7ce8dbe7834d589e81d4c007029d4;hp=aae08534dfe4135d84a01351d50153d57d53c346;hb=dbe19a54c0fc5e83207dbc046e98ee59e8425a17;hpb=3c43ca86e49da3eeb7e52a7ed5ae5f69c581e2a3

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index aae0853..6a49bea 100644
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -8,6 +8,8 @@ svgnames
 ]{memoir}                       % paper size, font size and other options for document
 \input{common/packages.tex}     % common packages
 
+\input{common/settings.tex}
+
 \begin{document}
 \input{common/title.tex}        % create and use custom title page
 
@@ -32,12 +34,20 @@ svgnames
 \include{parts/Editing}
 \include{parts/Rendering}
 \include{parts/Keyframes}
-<<<<<<< HEAD
-=======
-
-
+\include{parts/FFmpeg}
+\include{parts/Plugins}
+\include{parts/Transition}
+\include{parts/Overlays}
+\include{parts/Recording}
+\include{parts/DVD}
+\include{parts/Multi5s}
+\include{parts/Shortcuts}
+\include{parts/Configuration}
+
+
+\include{parts/Glossary}
 \printnomenclature      % print glossary
-\nomenclature{t}{test}  % remove this after adding actual glosssary item
+
 \newpage
 
 \listoftables
@@ -47,6 +57,5 @@ svgnames
 \newpage
 
 \listoftodos
->>>>>>> einhander
 
 \end{document}