aboutsummaryrefslogtreecommitdiffstats
path: root/library/tinymce/examples/media
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-04-11 18:47:21 +0200
committerMichael <icarus@dabo.de>2012-04-11 18:47:21 +0200
commitc3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (patch)
treea46d809d2e11fefba938717d38b1371572e4d815 /library/tinymce/examples/media
parent81a8d4f9dbd32de133e647c87a5394dd52f009fe (diff)
parentfe257a20324fe68838e5829e19d18777045a41b4 (diff)
downloadvolse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.gz
volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.bz2
volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'library/tinymce/examples/media')
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/logo.jpgbin2729 -> 2729 bytes
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/logo_over.jpgbin6473 -> 6473 bytes
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/sample.avibin82944 -> 82944 bytes
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/sample.dcrbin6774 -> 6774 bytes
-rw-r--r--library/tinymce/examples/media/sample.flvbin0 -> 88722 bytes
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/sample.movbin55622 -> 55622 bytes
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/sample.ram0
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/sample.rmbin17846 -> 17846 bytes
-rw-r--r--[-rwxr-xr-x]library/tinymce/examples/media/sample.swfbin6118 -> 6118 bytes
9 files changed, 0 insertions, 0 deletions
diff --git a/library/tinymce/examples/media/logo.jpg b/library/tinymce/examples/media/logo.jpg
index ad535d671..ad535d671 100755..100644
--- a/library/tinymce/examples/media/logo.jpg
+++ b/library/tinymce/examples/media/logo.jpg
Binary files differ
diff --git a/library/tinymce/examples/media/logo_over.jpg b/library/tinymce/examples/media/logo_over.jpg
index 79fcd884a..79fcd884a 100755..100644
--- a/library/tinymce/examples/media/logo_over.jpg
+++ b/library/tinymce/examples/media/logo_over.jpg
Binary files differ
diff --git a/library/tinymce/examples/media/sample.avi b/library/tinymce/examples/media/sample.avi
index 238bb688a..238bb688a 100755..100644
--- a/library/tinymce/examples/media/sample.avi
+++ b/library/tinymce/examples/media/sample.avi
Binary files differ
diff --git a/library/tinymce/examples/media/sample.dcr b/library/tinymce/examples/media/sample.dcr
index 353b3ce67..353b3ce67 100755..100644
--- a/library/tinymce/examples/media/sample.dcr
+++ b/library/tinymce/examples/media/sample.dcr
Binary files differ
diff --git a/library/tinymce/examples/media/sample.flv b/library/tinymce/examples/media/sample.flv
new file mode 100644
index 000000000..799d137e6
--- /dev/null
+++ b/library/tinymce/examples/media/sample.flv
Binary files differ
diff --git a/library/tinymce/examples/media/sample.mov b/library/tinymce/examples/media/sample.mov
index 9c0a0932c..9c0a0932c 100755..100644
--- a/library/tinymce/examples/media/sample.mov
+++ b/library/tinymce/examples/media/sample.mov
Binary files differ
diff --git a/library/tinymce/examples/media/sample.ram b/library/tinymce/examples/media/sample.ram
index e2ce04cf7..e2ce04cf7 100755..100644
--- a/library/tinymce/examples/media/sample.ram
+++ b/library/tinymce/examples/media/sample.ram
diff --git a/library/tinymce/examples/media/sample.rm b/library/tinymce/examples/media/sample.rm
index 8947706e0..8947706e0 100755..100644
--- a/library/tinymce/examples/media/sample.rm
+++ b/library/tinymce/examples/media/sample.rm
Binary files differ
diff --git a/library/tinymce/examples/media/sample.swf b/library/tinymce/examples/media/sample.swf
index 9f5fc4ac5..9f5fc4ac5 100755..100644
--- a/library/tinymce/examples/media/sample.swf
+++ b/library/tinymce/examples/media/sample.swf
Binary files differ