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

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index aae0853..b3f3977 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,18 @@ 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/Glossary}
 \printnomenclature      % print glossary
-\nomenclature{t}{test}  % remove this after adding actual glosssary item
+
 \newpage
 
 \listoftables
@@ -47,6 +55,5 @@ svgnames
 \newpage
 
 \listoftodos
->>>>>>> einhander
 
 \end{document}