Merge commit 'eb98affc5b5916de814d4fc666df87963bdde1e2' as 'clickslide'

diff --cc clickslide/.gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9b71e084c6d1b1837bbe06030a5905cab15ae805
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/clickslide/.gitignore
@@@ -1,0 -1,0 +1,3 @@@
++.*.swo
++.*.swp
++*.html

diff --cc clickslide/.gitmodules
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/clickslide/.gitmodules

diff --cc clickslide/cgilite/cgilite.sh
index 0000000000000000000000000000000000000000,ae09497817521d8795b0e92a7f859d5bda2426a9..ae09497817521d8795b0e92a7f859d5bda2426a9
mode 000000,100755..100755
--- /dev/null
--- 2/cgilite/cgilite.sh
+++ b/clickslide/cgilite/cgilite.sh

diff --cc clickslide/cgilite/file.sh
index 0000000000000000000000000000000000000000,b6118f522d8b31d4fa0b19ec42226ab263b705cf..b6118f522d8b31d4fa0b19ec42226ab263b705cf
mode 000000,100755..100755
--- /dev/null
--- 2/cgilite/file.sh
+++ b/clickslide/cgilite/file.sh

diff --cc clickslide/cgilite/html-sh.sed
index 0000000000000000000000000000000000000000,976d42e814d4f4d836f3bb93df97653f10fd4b48..976d42e814d4f4d836f3bb93df97653f10fd4b48
mode 000000,100755..100755
--- /dev/null
--- 2/cgilite/html-sh.sed
+++ b/clickslide/cgilite/html-sh.sed

diff --cc clickslide/cgilite/logging.sh
index 0000000000000000000000000000000000000000,31bb24d3c4d3b9abbcb7bb175bcd455d5a078d2c..31bb24d3c4d3b9abbcb7bb175bcd455d5a078d2c
mode 000000,100755..100755
--- /dev/null
--- 2/cgilite/logging.sh
+++ b/clickslide/cgilite/logging.sh

diff --cc clickslide/cgilite/session.sh
index 0000000000000000000000000000000000000000,25a65987c3671df4f4c8499279a71487edad5775..25a65987c3671df4f4c8499279a71487edad5775
mode 000000,100755..100755
--- /dev/null
--- 2/cgilite/session.sh
+++ b/clickslide/cgilite/session.sh

diff --cc clickslide/cgilite/storage.sh
index 0000000000000000000000000000000000000000,0d09b262b4d700dac399dbc165ff5250570d16fa..0d09b262b4d700dac399dbc165ff5250570d16fa
mode 000000,100755..100755
--- /dev/null
--- 2/cgilite/storage.sh
+++ b/clickslide/cgilite/storage.sh

diff --cc clickslide/clickslide.css
index 0000000000000000000000000000000000000000,084bf687297871a875570f32801ec5f4816ff65d..084bf687297871a875570f32801ec5f4816ff65d
mode 000000,100644..100644
--- /dev/null
--- 2/clickslide.css
+++ b/clickslide/clickslide.css

diff --cc clickslide/clickslide.sh
index 0000000000000000000000000000000000000000,980365f48ef04936424d8b5a8bc20e693ba0e406..980365f48ef04936424d8b5a8bc20e693ba0e406
mode 000000,100755..100755
--- /dev/null
--- 2/clickslide.sh
+++ b/clickslide/clickslide.sh

diff --cc clickslide/example.short
index 0000000000000000000000000000000000000000,0d903687d74528b3f41ce5b01f35868f5d7ef156..0d903687d74528b3f41ce5b01f35868f5d7ef156
mode 000000,100644..100644
--- /dev/null
--- 2/example.short
+++ b/clickslide/example.short

diff --cc clickslide/example/demo.short
index 0000000000000000000000000000000000000000,f2ab688c1113d8603afdc70b6065acf8463d9c7a..f2ab688c1113d8603afdc70b6065acf8463d9c7a
mode 000000,100644..100644
--- /dev/null
--- 2/example/demo.short
+++ b/clickslide/example/demo.short

diff --cc clickslide/example/exb0.jpg
index 0000000000000000000000000000000000000000,7aa9056798df3605132f795ad9e914ec47feda65..7aa9056798df3605132f795ad9e914ec47feda65
mode 000000,100644..100644
Binary files differ

diff --cc clickslide/example/exb0_light.jpg
index 0000000000000000000000000000000000000000,ea6dd7fc42c357f63e1265e4fccb3d53f0873975..ea6dd7fc42c357f63e1265e4fccb3d53f0873975
mode 000000,100644..100644
Binary files differ

diff --cc clickslide/example/exb1.jpg
index 0000000000000000000000000000000000000000,cec55200f22c56937ec09e07088bfef77f82614f..cec55200f22c56937ec09e07088bfef77f82614f
mode 000000,100644..100644
Binary files differ

diff --cc clickslide/example/exb1_light.jpg
index 0000000000000000000000000000000000000000,7a094dd4c43cf077ab0db6908199b153eb7ceab6..7a094dd4c43cf077ab0db6908199b153eb7ceab6
mode 000000,100644..100644
Binary files differ

diff --cc clickslide/example/exb2.jpg
index 0000000000000000000000000000000000000000,70710dc6b597f23adc3e7d642f009869c91dccec..70710dc6b597f23adc3e7d642f009869c91dccec
mode 000000,100644..100644
Binary files differ

diff --cc clickslide/example/exb2_light.jpg
index 0000000000000000000000000000000000000000,0c6c058429ae573b1d510729cbd65a7977814f69..0c6c058429ae573b1d510729cbd65a7977814f69
mode 000000,100644..100644
Binary files differ

diff --cc clickslide/example/exb3.jpg
index 0000000000000000000000000000000000000000,c6832f03544e60c9566ad7548c3df130b60d5cb6..c6832f03544e60c9566ad7548c3df130b60d5cb6
mode 000000,100644..100644
Binary files differ

diff --cc clickslide/example/exb3_light.jpg
index 0000000000000000000000000000000000000000,3808929a5627812144000e25a7e7daf94f386298..3808929a5627812144000e25a7e7daf94f386298
mode 000000,100644..100644
Binary files differ