diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/dom/string_extend.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/dom/string_extend.c')
| -rw-r--r-- | ext/dom/string_extend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/dom/string_extend.c b/ext/dom/string_extend.c index 75680089a4..0c0c0914d3 100644 --- a/ext/dom/string_extend.c +++ b/ext/dom/string_extend.c @@ -38,10 +38,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domstringextend +* class domstringextend * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend -* Since: +* Since: */ const zend_function_entry php_dom_string_extend_class_functions[] = { @@ -54,7 +54,7 @@ const zend_function_entry php_dom_string_extend_class_functions[] = { /* {{{ proto int dom_string_extend_find_offset16(int offset32); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset16 -Since: +Since: */ PHP_FUNCTION(dom_string_extend_find_offset16) { @@ -64,7 +64,7 @@ PHP_FUNCTION(dom_string_extend_find_offset16) /* {{{ proto int dom_string_extend_find_offset32(int offset16); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset32 -Since: +Since: */ PHP_FUNCTION(dom_string_extend_find_offset32) { |