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

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