From: Andrea-Paz <gamberucci.andrea@gmail.com>
Date: Tue, 28 May 2019 09:46:45 +0000 (+0200)
Subject: second add cha 8
X-Git-Tag: 2021-05~219^2~1
X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=f0cf0cc29ce97b556f251bd799c06763d64f0e33;hp=8982c84ba42f66704db50ab4fd87cfbcddf0e4f9;p=goodguy%2Fcin-manual-latex.git

second add cha 8
---

diff --git a/CinelerraGG_Manual.tdo b/CinelerraGG_Manual.tdo
index 1dedb7b..bddf16e 100644
--- a/CinelerraGG_Manual.tdo
+++ b/CinelerraGG_Manual.tdo
@@ -1 +1,5 @@
+<<<<<<< HEAD
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ First char should be capitalised}{140}{section*.43}% 
+=======
 \contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ First char should be capitalised}{138}{section*.42}% 
+>>>>>>> einhander
diff --git a/images/ganged.png b/images/ganged.png
new file mode 100644
index 0000000..0b74ee3
Binary files /dev/null and b/images/ganged.png differ