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

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index aae0853..67147e3 100644
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -32,12 +32,14 @@ svgnames
 \include{parts/Editing}
 \include{parts/Rendering}
 \include{parts/Keyframes}
-<<<<<<< HEAD
-=======
+\include{parts/FFmpeg}
+\include{parts/Plugins}
+\include{parts/Transition}
 
 
+\include{parts/Glossary}
 \printnomenclature      % print glossary
-\nomenclature{t}{test}  % remove this after adding actual glosssary item
+
 \newpage
 
 \listoftables
@@ -47,6 +49,5 @@ svgnames
 \newpage
 
 \listoftodos
->>>>>>> einhander
 
 \end{document}