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

2013-08-29 Thread Xinchen Hui 
Commit:f0cb67402f2bcd3dc310cf938dfce799ccec7c7b
Author:Xinchen Hui larue...@php.net Thu, 29 Aug 2013 14:01:54 
+0800
Parents:   bd677b43a78ebc0779ed64781172225d15b35671 
72027cd0848f1a5c580c601573448cdea9b095ca
Branches:  PHP-5.5 master

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

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

Changed paths:
  MM  Zend/zend_API.c


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_API.c

2013-08-29 Thread Xinchen Hui 
Commit:e356d790309acf870dc22be7d00edaed8261
Author:Xinchen Hui larue...@php.net Thu, 29 Aug 2013 14:02:34 
+0800
Parents:   f0cb67402f2bcd3dc310cf938dfce799ccec7c7b 
747daa53546bfa2c4a0fd88d2d3dffd30356c1ad
Branches:  PHP-5.5 master

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

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

Changed paths:
  MM  Zend/zend_API.c


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_API.c Zend/zend_API.h Zend/zend_builtin_functions.c

2013-03-21 Thread Xinchen Hui 
Commit:79925094c40a46a270fc079ddd6c2c92ff62c10f
Author:Xinchen Hui larue...@php.net Thu, 21 Mar 2013 21:10:32 
+0800
Parents:   f2383dead69d59143fee1d54de98f154d6833714 
7dce0194c815cdc75a780b6471660042aed7bd7a
Branches:  PHP-5.5

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

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

Changed paths:
  MM  Zend/zend_API.c
  MM  Zend/zend_API.h
  MM  Zend/zend_builtin_functions.c


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_API.c

2013-03-19 Thread Dmitry Stogov 
Commit:4837bdb91049e47e0c15873a2d1d4d1f7a4c65d2
Author:Dmitry Stogov dmi...@zend.com Tue, 19 Mar 2013 17:04:35 
+0400
Parents:   960d5be52873acdf1afc67aa12b72d2cdc93119c 
7b0993bfb4b19bb160a72310b907c4fc12a5bef9
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Fixed bug #63976 (Parent class incorrectly using child constant in class 
property)

Conflicts:
NEWS

Bugs:
https://bugs.php.net/63976

Changed paths:
  MM  Zend/zend_API.c


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_API.c

2013-03-19 Thread Anatol Belski 
Commit:6f0f5d5281f4311dc4254b917ba185bacb659add
Author:Anatol Belski a...@php.net Tue, 19 Mar 2013 14:44:20 +0100
Parents:   4837bdb91049e47e0c15873a2d1d4d1f7a4c65d2 
7687b8b81c599b0374cb902e9dd812d2cfc12efd
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  fix C90 compat

Changed paths:
  MM  Zend/zend_API.c


Diff:



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