diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-04 23:00:59 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-04 23:00:59 -0700 |
| commit | fe29b8134cbacf6ca07e948be4fe66813817cdad (patch) | |
| tree | 2bb36f2856bd5d68aa0d15da97e756a6e78a118d /Zend/zend_inheritance.c | |
| parent | 94a70b98a65db700192258addfa627101bbd86c5 (diff) | |
| parent | 1de1ff75f516d6a4124fa7408b92f7470452fa74 (diff) | |
| download | php-git-fe29b8134cbacf6ca07e948be4fe66813817cdad.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
hexadecimal is case*in*sensitive
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'Zend/zend_inheritance.c')
0 files changed, 0 insertions, 0 deletions