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

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index e3cbd4c..aae0853 100644
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -29,6 +29,24 @@ svgnames
 \include{parts/Windows}
 \include{parts/Attributes}
 \include{parts/Loadandsave}
+\include{parts/Editing}
 \include{parts/Rendering}
+\include{parts/Keyframes}
+<<<<<<< HEAD
+=======
+
+
+\printnomenclature      % print glossary
+\nomenclature{t}{test}  % remove this after adding actual glosssary item
+\newpage
+
+\listoftables
+\newpage
+
+\listoffigures
+\newpage
+
+\listoftodos
+>>>>>>> einhander
 
 \end{document}