]> granicus.if.org Git - php/commit
Avoid useless merge
authorDmitry Stogov <dmitry@zend.com>
Tue, 3 Jun 2014 22:11:26 +0000 (02:11 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 3 Jun 2014 22:11:26 +0000 (02:11 +0400)
commit6e7338700e8df8285c1d352b249e4970e35df472
tree4e62ee6a549b063620ab24f7d7bcd929927f5e77
parent3f6f0d5a700a7de777336569846fa2bfe23c667c
Avoid useless merge
Zend/zend_API.c
Zend/zend_API.h
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/pgsql/pgsql.c