]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 3 Mar 2015 07:46:55 +0000 (10:46 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 3 Mar 2015 07:46:55 +0000 (10:46 +0300)
* PHP-5.5:
  Added type checks

1  2 
ext/soap/php_encoding.c
ext/soap/soap.c

Simple merge
diff --cc ext/soap/soap.c
Simple merge