com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_h ighlight.c ext/pdo_mysql/pdo_mysql.c
| From: | Johannes Schlüter | Date: | Sun, 23 Feb 2014 13:56:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_h ighlight.c ext/pdo_mysql/pdo_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76188@lists.php.net to get a copy of this message | ||
Commit: 2198bbce868e8a3423e05c573ab4f69417ef5b88
Author: Johannes Schlüter <johannes@php.net> Sun, 23 Feb 2014 14:56:32 +0100
Parents: 851f36288299ff3dc4f8ff6d0fd9e5f56211d583 3f258e6b46f1f74c672f68a23b2b0905b435aa5a
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2198bbce868e8a3423e05c573ab4f69417ef5b88
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM Zend/zend_highlight.c
MM ext/pdo_mysql/pdo_mysql.c
Diff: