Merge branch 'Andrea-Paz'

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

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index aae08534dfe4135d84a01351d50153d57d53c346..611d161b68f305c5e6df23df05842e665a9e9d76 100644 (file)
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -32,12 +32,13 @@ svgnames
 \include{parts/Editing}
 \include{parts/Rendering}
 \include{parts/Keyframes}
-<<<<<<< HEAD
-=======
+\include{parts/FFmpeg}
 
 
+
+\include{parts/Glossary}
 \printnomenclature      % print glossary
-\nomenclature{t}{test}  % remove this after adding actual glosssary item
+
 \newpage
 
 \listoftables
@@ -47,6 +48,5 @@ svgnames
 \newpage
 
 \listoftodos
->>>>>>> einhander
 
 \end{document}