projects
/
goodguy
/
cin-manual-latex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync local branch
[goodguy/cin-manual-latex.git]
/
CinelerraGG_Manual.tex
diff --git
a/CinelerraGG_Manual.tex
b/CinelerraGG_Manual.tex
index 4b63d52eea4c311044322544bfb78e7b1a65da72..aae08534dfe4135d84a01351d50153d57d53c346 100644
(file)
--- a/
CinelerraGG_Manual.tex
+++ b/
CinelerraGG_Manual.tex
@@
-31,6
+31,14
@@
svgnames
\include{parts/Loadandsave}
\include{parts/Editing}
\include{parts/Rendering}
\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
\listoftables
\newpage
@@
-39,5
+47,6
@@
svgnames
\newpage
\listoftodos
\newpage
\listoftodos
+>>>>>>> einhander
\end{document}
\end{document}