Fixes from AndreaPaz
[goodguy/cin-manual-latex.git] / CinelerraGG_Manual.tex
index aae08534dfe4135d84a01351d50153d57d53c346..51adb11f82ad03693f21cdc0a412f2b2bc1d0376 100644 (file)
@@ -32,12 +32,14 @@ svgnames
 \include{parts/Editing}
 \include{parts/Rendering}
 \include{parts/Keyframes}
-<<<<<<< HEAD
-=======
+\include{parts/FFmpeg}
+\include{parts/Plugins}
 
 
+
+\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}