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

2013-03-11 Thread Xinchen Hui 
Commit:4573405c5dd6686bbe443497dfad84de13ac5cc7
Author:Xinchen Hui  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

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

2012-12-24 Thread Dmitry Stogov 
Commit:b8c719c0687aea8c13241abb5a52eefbac1a3a95
Author:Dmitry Stogov  Tue, 25 Dec 2012 10:33:01 
+0400
Parents:   be7b0bc3ec02e4f223920ee6397f9c4993eb7df5 
3f8c729e693c432b438cd33679182260d8732e30
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Traits refactoring

Changed paths:
  MM  Zend/zend.h
  MM  Zend/zend_compile.c
  MM  Zend/zend_compile.h
  MM  Zend/zend_language_parser.y
  MM  Zend/zend_opcode.c


Diff:



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