From: Paul Hänsch <paul@plutz.net>
Date: Wed, 18 Sep 2019 13:41:39 +0000 (+0200)
Subject: Merge commit '2c91cc63d0e28a4f202ee2db9a8d769e63d54f7f'
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=8a924700257f760132501cfc7114e5eb31bb11a9;p=vhs_kurs

Merge commit '2c91cc63d0e28a4f202ee2db9a8d769e63d54f7f'
---

8a924700257f760132501cfc7114e5eb31bb11a9
diff --cc clickslide/demo/Makefile
index 0000000,7cb4080..7cb4080
mode 000000,100644..100644
--- a/clickslide/demo/Makefile
+++ b/clickslide/demo/Makefile
diff --cc clickslide/demo/demo.short
index 0000000,9b239f6..9b239f6
mode 000000,100644..100644
--- a/clickslide/demo/demo.short
+++ b/clickslide/demo/demo.short
diff --cc clickslide/demo/exb0.jpg
index 7aa9056,7aa9056..7aa9056
Binary files differ
diff --cc clickslide/demo/exb1.jpg
index cec5520,cec5520..cec5520
Binary files differ
diff --cc clickslide/demo/exb2.jpg
index 70710dc,70710dc..70710dc
Binary files differ
diff --cc clickslide/demo/exb3.jpg
index c6832f0,c6832f0..c6832f0
Binary files differ