summaryrefslogtreecommitdiff
path: root/ext/simplexml
diff options
context:
space:
mode:
authorDavid Soria Parra <dsp@php.net>2012-03-20 16:58:58 (GMT)
committerDavid Soria Parra <dsp@php.net>2012-03-20 16:58:58 (GMT)
commitc918ca57a7233206ec78ac00438eeb6830e3680b (patch)
tree6a0b5e4ea85c7a53a15231cfc7291837d9ea9c09 /ext/simplexml
parent71d894cd421d96517618e9d33dfea640499c8ffd (diff)
parentf7b10abae939412e8b5cab69cd579e071deb446b (diff)
downloadphp-c918ca57a7233206ec78ac00438eeb6830e3680b.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Replace $Revision$ with $Id$ in keyword expansion enable files Enable $Id$ expansion for files with the $Revision$ keyword Conflicts: ext/mysqlnd/mysqlnd.h
Diffstat (limited to 'ext/simplexml')
-rw-r--r--ext/simplexml/simplexml.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 334dcd4..455280f 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2638,7 +2638,7 @@ PHP_MINFO_FUNCTION(simplexml)
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision$");
+ php_info_print_table_row(2, "Revision", "$Id$");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");