[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend.h

[Xinchen Hui]

Commit:    4573405c5dd6686bbe443497dfad84de13ac5cc7
Author:    Xinchen Hui <larue...@php.net>         Mon, 11 Mar 2013 15:16:47 
+0800
Parents:   c7ad92fac72a11efcfa9b70cb19d9feae87936d6 
0444708c5cd665179a936b86369f84b9dad8effe
Branches:  PHP-5.5

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=4573405c5dd6686bbe443497dfad84de13ac5cc7

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  Zend/zend.h


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php