summaryrefslogtreecommitdiff
path: root/includes/general.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-04-15 23:50:38 +0200
committerBenny Baumann <BenBE@geshi.org>2014-04-15 23:50:38 +0200
commit0ea069195e48daced9e92cc919be59a483566c78 (patch)
tree5f1eb2e1fbcd0f465a56cdf5613fded156e7081a /includes/general.php
parentcf0497dcead22ffb3d341aca60a730c61931e9ef (diff)
parentea9f9d8d7f0b8f196161333384da2b814ac973fe (diff)
downloadcacert-devel-0ea069195e48daced9e92cc919be59a483566c78.tar.gz
cacert-devel-0ea069195e48daced9e92cc919be59a483566c78.tar.xz
cacert-devel-0ea069195e48daced9e92cc919be59a483566c78.zip
Merge branch 'bug-1184' into release
Diffstat (limited to 'includes/general.php')
-rw-r--r--includes/general.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php
index 5c61ec0..f36ccdf 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -506,7 +506,7 @@
return(0);
}
- function hex2bin($data)
+ function gpg_hex2bin($data)
{
while(strstr($data, "\\x"))
{