From: Paul Hänsch <paul@plutz.net>
Date: Tue, 23 Apr 2019 11:22:16 +0000 (+0200)
Subject: Merge commit 'eb98affc5b5916de814d4fc666df87963bdde1e2' as 'clickslide'
X-Git-Tag: Chemnitz_2019-04~9
X-Git-Url: http://git.plutz.net/?p=vhs_kurs;a=commitdiff_plain;h=a659176f8a57114eac7a68ef0d8586b92bde442c

Merge commit 'eb98affc5b5916de814d4fc666df87963bdde1e2' as 'clickslide'
---

a659176f8a57114eac7a68ef0d8586b92bde442c
diff --cc clickslide/.gitignore
index 0000000,0000000..9b71e08
new file mode 100644
--- /dev/null
+++ b/clickslide/.gitignore
@@@ -1,0 -1,0 +1,3 @@@
++.*.swo
++.*.swp
++*.html
diff --cc clickslide/.gitmodules
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/clickslide/.gitmodules
diff --cc clickslide/cgilite/cgilite.sh
index 0000000,ae09497..ae09497
mode 000000,100755..100755
--- a/clickslide/cgilite/cgilite.sh
+++ b/clickslide/cgilite/cgilite.sh
diff --cc clickslide/cgilite/file.sh
index 0000000,b6118f5..b6118f5
mode 000000,100755..100755
--- a/clickslide/cgilite/file.sh
+++ b/clickslide/cgilite/file.sh
diff --cc clickslide/cgilite/html-sh.sed
index 0000000,976d42e..976d42e
mode 000000,100755..100755
--- a/clickslide/cgilite/html-sh.sed
+++ b/clickslide/cgilite/html-sh.sed
diff --cc clickslide/cgilite/logging.sh
index 0000000,31bb24d..31bb24d
mode 000000,100755..100755
--- a/clickslide/cgilite/logging.sh
+++ b/clickslide/cgilite/logging.sh
diff --cc clickslide/cgilite/session.sh
index 0000000,25a6598..25a6598
mode 000000,100755..100755
--- a/clickslide/cgilite/session.sh
+++ b/clickslide/cgilite/session.sh
diff --cc clickslide/cgilite/storage.sh
index 0000000,0d09b26..0d09b26
mode 000000,100755..100755
--- a/clickslide/cgilite/storage.sh
+++ b/clickslide/cgilite/storage.sh
diff --cc clickslide/clickslide.css
index 0000000,084bf68..084bf68
mode 000000,100644..100644
--- a/clickslide/clickslide.css
+++ b/clickslide/clickslide.css
diff --cc clickslide/clickslide.sh
index 0000000,980365f..980365f
mode 000000,100755..100755
--- a/clickslide/clickslide.sh
+++ b/clickslide/clickslide.sh
diff --cc clickslide/example.short
index 0000000,0d90368..0d90368
mode 000000,100644..100644
--- a/clickslide/example.short
+++ b/clickslide/example.short
diff --cc clickslide/example/demo.short
index 0000000,f2ab688..f2ab688
mode 000000,100644..100644
--- a/clickslide/example/demo.short
+++ b/clickslide/example/demo.short
diff --cc clickslide/example/exb0.jpg
index 0000000,7aa9056..7aa9056
mode 000000,100644..100644
Binary files differ
diff --cc clickslide/example/exb0_light.jpg
index 0000000,ea6dd7f..ea6dd7f
mode 000000,100644..100644
Binary files differ
diff --cc clickslide/example/exb1.jpg
index 0000000,cec5520..cec5520
mode 000000,100644..100644
Binary files differ
diff --cc clickslide/example/exb1_light.jpg
index 0000000,7a094dd..7a094dd
mode 000000,100644..100644
Binary files differ
diff --cc clickslide/example/exb2.jpg
index 0000000,70710dc..70710dc
mode 000000,100644..100644
Binary files differ
diff --cc clickslide/example/exb2_light.jpg
index 0000000,0c6c058..0c6c058
mode 000000,100644..100644
Binary files differ
diff --cc clickslide/example/exb3.jpg
index 0000000,c6832f0..c6832f0
mode 000000,100644..100644
Binary files differ
diff --cc clickslide/example/exb3_light.jpg
index 0000000,3808929..3808929
mode 000000,100644..100644
Binary files differ