diff options
Diffstat (limited to 'buildscripts/phing/classes/phing/mappers/MergeMapper.php')
| -rwxr-xr-x[-rw-r--r--] | buildscripts/phing/classes/phing/mappers/MergeMapper.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/buildscripts/phing/classes/phing/mappers/MergeMapper.php b/buildscripts/phing/classes/phing/mappers/MergeMapper.php index f10f41c0..dc60ab34 100644..100755 --- a/buildscripts/phing/classes/phing/mappers/MergeMapper.php +++ b/buildscripts/phing/classes/phing/mappers/MergeMapper.php @@ -1,6 +1,6 @@ <?php /* - * $Id: MergeMapper.php,v 1.8 2004/01/22 03:29:13 hlellelid Exp $ + * $Id: 9f014a901932e99fd50820d3f3a78387929f06ee $ * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -26,7 +26,7 @@ include_once 'phing/mappers/FileNameMapper.php'; * was set for "to". * * @author Andreas Aderhold <andi@binarycloud.com> - * @version $Revision: 1.8 $ + * @version $Id$ * @package phing.mappers */ class MergeMapper implements FileNameMapper { @@ -37,10 +37,10 @@ class MergeMapper implements FileNameMapper { /** * The mapper implementation. Basically does nothing in this case. * - * @param mixed The data the mapper works on - * @returns mixed The data after the mapper has been applied - * @access public - * @author Andreas Aderhold, andi@binarycloud.com + * @param mixed The data the mapper works on + * @return mixed The data after the mapper has been applied + * @access public + * @author Andreas Aderhold, andi@binarycloud.com */ function main($sourceFileName) { if ($this->mergedFile === null) { @@ -52,10 +52,10 @@ class MergeMapper implements FileNameMapper { /** * Accessor. Sets the to property * - * @param string To what this mapper should convert the from string - * @returns boolean True - * @access public - * @author Andreas Aderhold, andi@binarycloud.com + * @param string To what this mapper should convert the from string + * @return boolean True + * @access public + * @author Andreas Aderhold, andi@binarycloud.com */ function setTo($to) { $this->mergedFile = $to; |