com php-src: Resolve conflict: Zend/zend_hash.c Zend/zend _language_scanner.c Zend/zend_portability.h ext/e xif/exif.c ext/mysqli/mysqli_nonapi.c
ext/mysqlnd/mys qlnd_wireprotocol.c ext/phar/phar.c ext/standard/brow scap.c ext/standard/crypt.c ext/standard/pack.c ext /standard/php_crypt_r.c
ext/standard/var_unserializer .re ext/wddx/wddx.c main/php.h main/strlcat.c m ain/strlcpy.c

From: Date: Tue, 03 Jan 2017 14:01:05 +0000
Subject: com php-src: Resolve conflict: Zend/zend_hash.c Zend/zend _language_scanner.c Zend/zend_portability.h ext/e xif/exif.c ext/mysqli/mysqli_nonapi.c
ext/mysqlnd/mys qlnd_wireprotocol.c ext/phar/phar.c ext/standard/brow scap.c ext/standard/crypt.c ext/standard/pack.c ext /standard/php_crypt_r.c
ext/standard/var_unserializer .re ext/wddx/wddx.c main/php.h main/strlcat.c m ain/strlcpy.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96529@lists.php.net to get a copy of this message
Commit: 1e3624290ab30291765feca1502e8cf3aa773314 Author: Sammy Kaye Powers <sammyk@sammykmedia.com> Tue, 3 Jan 2017 08:01:05 -0600 Parents: 9e29f841ce3711488781be958ffdfc42d738de4a f0031ed15156e7a07983aba7a9a3155c3eb31252 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1e3624290ab30291765feca1502e8cf3aa773314 Log: Resolve conflict Changed paths: MM Zend/zend_hash.c MM Zend/zend_language_scanner.c MM Zend/zend_portability.h MM ext/exif/exif.c MM ext/mysqli/mysqli_nonapi.c MM ext/mysqlnd/mysqlnd_wireprotocol.c MM ext/phar/phar.c MM ext/standard/browscap..c MM ext/standard/crypt.c MM ext/standard/pack.c MM ext/standard/php_crypt_r.c MM ext/standard/var_unserializer.re MM ext/wddx/wddx.c MM main/php.h MM main/strlcat.c MM main/strlcpy.c Diff:

« previous php.cvs (#96529) next »