diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 17:04:35 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 17:04:35 +0400 |
| commit | 4837bdb91049e47e0c15873a2d1d4d1f7a4c65d2 (patch) | |
| tree | a53f36f6f09a454dfa10f491ef79331a51ecb1a4 /main/php_ini.c | |
| parent | 960d5be52873acdf1afc67aa12b72d2cdc93119c (diff) | |
| parent | 7b0993bfb4b19bb160a72310b907c4fc12a5bef9 (diff) | |
| download | php-git-4837bdb91049e47e0c15873a2d1d4d1f7a4c65d2.tar.gz | |
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
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions