com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/standard/ credits_ext.h

From: Date: Fri, 10 Jan 2014 15:02:46 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/standard/ credits_ext.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75565@lists.php.net to get a copy of this message
Commit: 45d46d7edd4d1559370cf4db76c842caf6f9c087 Author: Johannes Schlüter <johannes@php.net> Fri, 10 Jan 2014 16:02:46 +0100 Parents: ec89e6bfe2ddd9ed13547d5cb09dbdf3dbbb83b4 98e06a10d354149995e3b9dc2b0932d98ee5b561 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45d46d7edd4d1559370cf4db76c842caf6f9c087 Log: Merge branch 'PHP-5.5' into PHP-5.6 Changed paths: MM ext/standard/credits_ext.h Diff: diff --cc ext/standard/credits_ext.h index efefa98,1d65285..f77bbdf --- a/ext/standard/credits_ext.h +++ b/ext/standard/credits_ext.h @@@ -77,10 -77,10 +77,10 @@@ CREDIT_LINE("System V Shared Memory", " CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky"); CREDIT_LINE("tokenizer", "Andrei Zmievski, Johannes Schlueter"); CREDIT_LINE("WDDX", "Andrei Zmievski"); + CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes"); CREDIT_LINE("XMLReader", "Rob Richards"); CREDIT_LINE("xmlrpc", "Dan Libby"); - CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes"); CREDIT_LINE("XMLWriter", "Rob Richards, Pierre-Alain Joye"); CREDIT_LINE("XSL", "Christian Stocker, Rob Richards"); -CREDIT_LINE("Zip", "Pierre-Alain Joye"); +CREDIT_LINE("Zip", "Pierre-Alain Joye, Remi Collet"); CREDIT_LINE("Zlib", "Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti, Michael Wallner");

« previous php.cvs (#75565) next »