aboutsummaryrefslogtreecommitdiffstats
path: root/library/simplepie/idn
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-08 10:33:32 +0200
committerzottel <github@zottel.net>2012-04-08 10:33:32 +0200
commitaaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (patch)
tree1d7e5f2b575b8836fefe76660f466cb176585d5c /library/simplepie/idn
parent64a1367525ac920721943a08adec1124657df70d (diff)
parente3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff)
downloadvolse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.gz
volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.bz2
volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'library/simplepie/idn')
-rw-r--r--[-rwxr-xr-x]library/simplepie/idn/LICENCE0
-rw-r--r--[-rwxr-xr-x]library/simplepie/idn/ReadMe.txt0
-rw-r--r--[-rwxr-xr-x]library/simplepie/idn/idna_convert.class.php0
-rw-r--r--[-rwxr-xr-x]library/simplepie/idn/npdata.ser0
4 files changed, 0 insertions, 0 deletions
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