diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
| commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
| tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /library/simplepie | |
| parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'library/simplepie')
60 files changed, 0 insertions, 0 deletions
diff --git a/library/simplepie/LICENSE.txt b/library/simplepie/LICENSE.txt index a822a4bd9..a822a4bd9 100755..100644 --- a/library/simplepie/LICENSE.txt +++ b/library/simplepie/LICENSE.txt diff --git a/library/simplepie/README.markdown b/library/simplepie/README.markdown index e5ca021ce..e5ca021ce 100755..100644 --- a/library/simplepie/README.markdown +++ b/library/simplepie/README.markdown diff --git a/library/simplepie/compatibility_test/COMPATIBILITY README.txt b/library/simplepie/compatibility_test/COMPATIBILITY README.txt index 5b2498992..5b2498992 100755..100644 --- a/library/simplepie/compatibility_test/COMPATIBILITY README.txt +++ b/library/simplepie/compatibility_test/COMPATIBILITY README.txt diff --git a/library/simplepie/compatibility_test/sp_compatibility_test.php b/library/simplepie/compatibility_test/sp_compatibility_test.php index a7a7f5fde..a7a7f5fde 100755..100644 --- a/library/simplepie/compatibility_test/sp_compatibility_test.php +++ b/library/simplepie/compatibility_test/sp_compatibility_test.php diff --git a/library/simplepie/create.php b/library/simplepie/create.php index 908ed182b..908ed182b 100755..100644 --- a/library/simplepie/create.php +++ b/library/simplepie/create.php diff --git a/library/simplepie/db.sql b/library/simplepie/db.sql index 13f504c21..13f504c21 100755..100644 --- a/library/simplepie/db.sql +++ b/library/simplepie/db.sql diff --git a/library/simplepie/demo/cli_test.php b/library/simplepie/demo/cli_test.php index ec933c5ad..ec933c5ad 100755..100644 --- a/library/simplepie/demo/cli_test.php +++ b/library/simplepie/demo/cli_test.php diff --git a/library/simplepie/demo/for_the_demo/alternate_favicon.png b/library/simplepie/demo/for_the_demo/alternate_favicon.png Binary files differindex 063fb2805..063fb2805 100755..100644 --- a/library/simplepie/demo/for_the_demo/alternate_favicon.png +++ b/library/simplepie/demo/for_the_demo/alternate_favicon.png diff --git a/library/simplepie/demo/for_the_demo/background_blockquote.png b/library/simplepie/demo/for_the_demo/background_blockquote.png Binary files differindex 8267e23a2..8267e23a2 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_blockquote.png +++ b/library/simplepie/demo/for_the_demo/background_blockquote.png diff --git a/library/simplepie/demo/for_the_demo/background_menuitem.gif b/library/simplepie/demo/for_the_demo/background_menuitem.gif Binary files differindex fa765d670..fa765d670 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_menuitem.gif +++ b/library/simplepie/demo/for_the_demo/background_menuitem.gif diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif Binary files differindex 236cf406d..236cf406d 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif +++ b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif Binary files differindex 95cfb820d..95cfb820d 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif +++ b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif diff --git a/library/simplepie/demo/for_the_demo/favicons/alternate.png b/library/simplepie/demo/for_the_demo/favicons/alternate.png Binary files differindex 063fb2805..063fb2805 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/alternate.png +++ b/library/simplepie/demo/for_the_demo/favicons/alternate.png diff --git a/library/simplepie/demo/for_the_demo/favicons/blinklist.png b/library/simplepie/demo/for_the_demo/favicons/blinklist.png Binary files differindex 53200b3c6..53200b3c6 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/blinklist.png +++ b/library/simplepie/demo/for_the_demo/favicons/blinklist.png diff --git a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png Binary files differindex c5372614a..c5372614a 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png +++ b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png diff --git a/library/simplepie/demo/for_the_demo/favicons/delicious.png b/library/simplepie/demo/for_the_demo/favicons/delicious.png Binary files differindex 2e6021d26..2e6021d26 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/delicious.png +++ b/library/simplepie/demo/for_the_demo/favicons/delicious.png diff --git a/library/simplepie/demo/for_the_demo/favicons/digg.png b/library/simplepie/demo/for_the_demo/favicons/digg.png Binary files differindex 3aa96770e..3aa96770e 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/digg.png +++ b/library/simplepie/demo/for_the_demo/favicons/digg.png diff --git a/library/simplepie/demo/for_the_demo/favicons/magnolia.png b/library/simplepie/demo/for_the_demo/favicons/magnolia.png Binary files differindex da519f5ab..da519f5ab 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/magnolia.png +++ b/library/simplepie/demo/for_the_demo/favicons/magnolia.png diff --git a/library/simplepie/demo/for_the_demo/favicons/myweb2.png b/library/simplepie/demo/for_the_demo/favicons/myweb2.png Binary files differindex 2a12968d5..2a12968d5 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/myweb2.png +++ b/library/simplepie/demo/for_the_demo/favicons/myweb2.png diff --git a/library/simplepie/demo/for_the_demo/favicons/newsvine.png b/library/simplepie/demo/for_the_demo/favicons/newsvine.png Binary files differindex 5cdbb31c6..5cdbb31c6 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/newsvine.png +++ b/library/simplepie/demo/for_the_demo/favicons/newsvine.png diff --git a/library/simplepie/demo/for_the_demo/favicons/reddit.png b/library/simplepie/demo/for_the_demo/favicons/reddit.png Binary files differindex 65c38867c..65c38867c 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/reddit.png +++ b/library/simplepie/demo/for_the_demo/favicons/reddit.png diff --git a/library/simplepie/demo/for_the_demo/favicons/segnalo.png b/library/simplepie/demo/for_the_demo/favicons/segnalo.png Binary files differindex 748149b37..748149b37 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/segnalo.png +++ b/library/simplepie/demo/for_the_demo/favicons/segnalo.png diff --git a/library/simplepie/demo/for_the_demo/favicons/simpy.png b/library/simplepie/demo/for_the_demo/favicons/simpy.png Binary files differindex 30b23c1a5..30b23c1a5 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/simpy.png +++ b/library/simplepie/demo/for_the_demo/favicons/simpy.png diff --git a/library/simplepie/demo/for_the_demo/favicons/spurl.png b/library/simplepie/demo/for_the_demo/favicons/spurl.png Binary files differindex f5be3963d..f5be3963d 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/spurl.png +++ b/library/simplepie/demo/for_the_demo/favicons/spurl.png diff --git a/library/simplepie/demo/for_the_demo/favicons/technorati.png b/library/simplepie/demo/for_the_demo/favicons/technorati.png Binary files differindex 0f19e824e..0f19e824e 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/technorati.png +++ b/library/simplepie/demo/for_the_demo/favicons/technorati.png diff --git a/library/simplepie/demo/for_the_demo/favicons/wists.png b/library/simplepie/demo/for_the_demo/favicons/wists.png Binary files differindex 2e2d294d1..2e2d294d1 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/wists.png +++ b/library/simplepie/demo/for_the_demo/favicons/wists.png diff --git a/library/simplepie/demo/for_the_demo/feed.png b/library/simplepie/demo/for_the_demo/feed.png Binary files differindex e23c50c85..e23c50c85 100755..100644 --- a/library/simplepie/demo/for_the_demo/feed.png +++ b/library/simplepie/demo/for_the_demo/feed.png diff --git a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png Binary files differindex eda2d868b..eda2d868b 100755..100644 --- a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png +++ b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png diff --git a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf Binary files differindex 0a41e15eb..0a41e15eb 100755..100644 --- a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf +++ b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf diff --git a/library/simplepie/demo/for_the_demo/mediaplayer.swf b/library/simplepie/demo/for_the_demo/mediaplayer.swf Binary files differindex bf78fd919..bf78fd919 100755..100644 --- a/library/simplepie/demo/for_the_demo/mediaplayer.swf +++ b/library/simplepie/demo/for_the_demo/mediaplayer.swf diff --git a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm index 56e12c309..56e12c309 100755..100644 --- a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm +++ b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm diff --git a/library/simplepie/demo/for_the_demo/mini_podcast.png b/library/simplepie/demo/for_the_demo/mini_podcast.png Binary files differindex fd6faf2a3..fd6faf2a3 100755..100644 --- a/library/simplepie/demo/for_the_demo/mini_podcast.png +++ b/library/simplepie/demo/for_the_demo/mini_podcast.png diff --git a/library/simplepie/demo/for_the_demo/place_audio.png b/library/simplepie/demo/for_the_demo/place_audio.png Binary files differindex 560ea0039..560ea0039 100755..100644 --- a/library/simplepie/demo/for_the_demo/place_audio.png +++ b/library/simplepie/demo/for_the_demo/place_audio.png diff --git a/library/simplepie/demo/for_the_demo/place_video.png b/library/simplepie/demo/for_the_demo/place_video.png Binary files differindex be5ec8219..be5ec8219 100755..100644 --- a/library/simplepie/demo/for_the_demo/place_video.png +++ b/library/simplepie/demo/for_the_demo/place_video.png diff --git a/library/simplepie/demo/for_the_demo/sIFR-print.css b/library/simplepie/demo/for_the_demo/sIFR-print.css index ec89b1961..ec89b1961 100755..100644 --- a/library/simplepie/demo/for_the_demo/sIFR-print.css +++ b/library/simplepie/demo/for_the_demo/sIFR-print.css diff --git a/library/simplepie/demo/for_the_demo/sIFR-screen.css b/library/simplepie/demo/for_the_demo/sIFR-screen.css index 778e09d2b..778e09d2b 100755..100644 --- a/library/simplepie/demo/for_the_demo/sIFR-screen.css +++ b/library/simplepie/demo/for_the_demo/sIFR-screen.css diff --git a/library/simplepie/demo/for_the_demo/sifr-config.js b/library/simplepie/demo/for_the_demo/sifr-config.js index e7066b361..e7066b361 100755..100644 --- a/library/simplepie/demo/for_the_demo/sifr-config.js +++ b/library/simplepie/demo/for_the_demo/sifr-config.js diff --git a/library/simplepie/demo/for_the_demo/sifr.js b/library/simplepie/demo/for_the_demo/sifr.js index 0a8b1b6dc..0a8b1b6dc 100755..100644 --- a/library/simplepie/demo/for_the_demo/sifr.js +++ b/library/simplepie/demo/for_the_demo/sifr.js diff --git a/library/simplepie/demo/for_the_demo/simplepie.css b/library/simplepie/demo/for_the_demo/simplepie.css index 3753cb96d..3753cb96d 100755..100644 --- a/library/simplepie/demo/for_the_demo/simplepie.css +++ b/library/simplepie/demo/for_the_demo/simplepie.css diff --git a/library/simplepie/demo/for_the_demo/sleight.js b/library/simplepie/demo/for_the_demo/sleight.js index 4b5058e9a..4b5058e9a 100755..100644 --- a/library/simplepie/demo/for_the_demo/sleight.js +++ b/library/simplepie/demo/for_the_demo/sleight.js diff --git a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png Binary files differindex 2bfd87d0c..2bfd87d0c 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png +++ b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png diff --git a/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png Binary files differindex d0629769c..d0629769c 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png +++ b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as index 6a98ca552..6a98ca552 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt index 2b9d32d20..2b9d32d20 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as index 4d371954b..4d371954b 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as index 4902e003f..4902e003f 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla Binary files differindex 2aa3f647f..2aa3f647f 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla diff --git a/library/simplepie/demo/for_the_demo/top_gradient.gif b/library/simplepie/demo/for_the_demo/top_gradient.gif Binary files differindex f77bd38f9..f77bd38f9 100755..100644 --- a/library/simplepie/demo/for_the_demo/top_gradient.gif +++ b/library/simplepie/demo/for_the_demo/top_gradient.gif diff --git a/library/simplepie/demo/for_the_demo/verdana.swf b/library/simplepie/demo/for_the_demo/verdana.swf Binary files differindex baf035047..baf035047 100755..100644 --- a/library/simplepie/demo/for_the_demo/verdana.swf +++ b/library/simplepie/demo/for_the_demo/verdana.swf diff --git a/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf Binary files differindex c812a79dc..c812a79dc 100755..100644 --- a/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf +++ b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf diff --git a/library/simplepie/demo/handler_image.php b/library/simplepie/demo/handler_image.php index 49c3ec89b..49c3ec89b 100755..100644 --- a/library/simplepie/demo/handler_image.php +++ b/library/simplepie/demo/handler_image.php diff --git a/library/simplepie/demo/index.php b/library/simplepie/demo/index.php index 1481ba917..1481ba917 100755..100644 --- a/library/simplepie/demo/index.php +++ b/library/simplepie/demo/index.php diff --git a/library/simplepie/demo/minimalistic.php b/library/simplepie/demo/minimalistic.php index 56509c00c..56509c00c 100755..100644 --- a/library/simplepie/demo/minimalistic.php +++ b/library/simplepie/demo/minimalistic.php diff --git a/library/simplepie/demo/multifeeds.php b/library/simplepie/demo/multifeeds.php index b23d792a2..b23d792a2 100755..100644 --- a/library/simplepie/demo/multifeeds.php +++ b/library/simplepie/demo/multifeeds.php diff --git a/library/simplepie/demo/test.php b/library/simplepie/demo/test.php index 5b9943abb..5b9943abb 100755..100644 --- a/library/simplepie/demo/test.php +++ b/library/simplepie/demo/test.php diff --git a/library/simplepie/idn/LICENCE b/library/simplepie/idn/LICENCE index 25a1d22df..25a1d22df 100755..100644 --- a/library/simplepie/idn/LICENCE +++ b/library/simplepie/idn/LICENCE diff --git a/library/simplepie/idn/ReadMe.txt b/library/simplepie/idn/ReadMe.txt index 7ca8c7e6d..7ca8c7e6d 100755..100644 --- a/library/simplepie/idn/ReadMe.txt +++ b/library/simplepie/idn/ReadMe.txt diff --git a/library/simplepie/idn/idna_convert.class.php b/library/simplepie/idn/idna_convert.class.php index ed2bae26d..ed2bae26d 100755..100644 --- a/library/simplepie/idn/idna_convert.class.php +++ b/library/simplepie/idn/idna_convert.class.php diff --git a/library/simplepie/idn/npdata.ser b/library/simplepie/idn/npdata.ser index d7ce6d03f..d7ce6d03f 100755..100644 --- a/library/simplepie/idn/npdata.ser +++ b/library/simplepie/idn/npdata.ser diff --git a/library/simplepie/simplepie.inc b/library/simplepie/simplepie.inc index 8a2739f52..8a2739f52 100755..100644 --- a/library/simplepie/simplepie.inc +++ b/library/simplepie/simplepie.inc |
