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

Reply via email to