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

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index aae0853..611d161 100644
--- 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}