cvs: /php4/ext/standard basic_functions.c
| From: | Andrey Zmievski | Date: | Sat, 17 Jul 1999 15:23:32 +0000 |
| Subject: | cvs: /php4/ext/standard basic_functions.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-2201@lists.php.net to get a copy of this message | ||
andrey Sat Jul 17 15:23:32 1999 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
Proto change
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.46 php4/ext/standard/basic_functions.c:1.47
--- php4/ext/standard/basic_functions.c:1.46 Sat Jul 17 15:17:42 1999
+++ php4/ext/standard/basic_functions.c Sat Jul 17 15:23:32 1999
@@ -2842,7 +2842,7 @@
/* }}} */
-/* {{{ proto array array_merge(array arr1 [, array arr2, ...])
+/* {{{ proto array array_merge(array arr1, array arr2 [, ...])
Merges elements from passed arrays into one array */
PHP_FUNCTION(array_merge)
{