Merge branch 'master' of github.com:Andrea-Paz/cin-manual-latex into Andrea-Paz

[goodguy/cin-manual-latex.git] / CinelerraGG_Manual.tex

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index aae08534dfe4135d84a01351d50153d57d53c346..7331a670cd9fc36e68349b480afdfc72100513b8 100644 (file)
--- 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,19 @@ 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/Glossary}
 \printnomenclature      % print glossary
-\nomenclature{t}{test}  % remove this after adding actual glosssary item
+
 \newpage
 
 \listoftables
@@ -47,6 +56,5 @@ svgnames
 \newpage
 
 \listoftodos
->>>>>>> einhander
 
 \end{document}