Are you sure you really wanted to commit this?
On 10.02.2006 15:35, Uwe Steinmann wrote:
steinm Fri Feb 10 12:35:19 2006 UTC
Modified files:
/phpdoc/en/reference/paradox/functions px-set-targetencoding.xml
Log:
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/paradox/functions/px-set-targetencoding.xml?r1=1.4&r2=1.5&diff_format=u
Index: phpdoc/en/reference/paradox/functions/px-set-targetencoding.xml
diff -u phpdoc/en/reference/paradox/functions/px-set-targetencoding.xml:1.4
phpdoc/en/reference/paradox/functions/px-set-targetencoding.xml:1.5
--- phpdoc/en/reference/paradox/functions/px-set-targetencoding.xml:1.4 Wed Feb
8 09:17:53 2006
+++ phpdoc/en/reference/paradox/functions/px-set-targetencoding.xml Fri Feb
10 12:35:19 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/paradox.xml, last change in rev -->
<refentry id="function.px-set-targetencoding">
<refnamediv>
@@ -23,8 +23,12 @@
iconv or recode.
</para>
<para>This function is deprecated and should be replaced by calling
+<<<<<<< px-set-targetencoding.xml
+ <function>px_set_parameter</function>.</para>
+=======
<function>px_set_parameter</function>.
</para>
+>>>>>>> 1.4
<para>
See also <function>px_get_info</function> to determine the DOS code page
as stored in the database file.
--
Wbr,
Antony Dovgal
