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=4b63d52eea4c311044322544bfb78e7b1a65da72;hb=3c43ca86e49da3eeb7e52a7ed5ae5f69c581e2a3;hpb=058de5ddf0a0c3448cd234c007a6c5edd1ffb55f

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index 4b63d52..aae0853 100644
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -31,6 +31,14 @@ svgnames
 \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
@@ -39,5 +47,6 @@ svgnames
 \newpage
 
 \listoftodos
+>>>>>>> einhander
 
 \end{document}