diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 10:21:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 10:21:05 +0100 |
| commit | a85eb75cba76845c645732e3ba230b83b019a914 (patch) | |
| tree | 9219b1d47a722c270e476fa89b9f4558239a87b0 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | 9e4310eeebf40e8fe3ab2f85203ea8cb1545b685 (diff) | |
| parent | 53c8b180c8efaab3edf7a02d39ca4e9628e1f67b (diff) | |
| download | php-git-a85eb75cba76845c645732e3ba230b83b019a914.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix perm again...
cleanup uneeded cast
fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian)
Conflicts:
ext/phar/func_interceptors.c
ext/phar/phar_object.c
sapi/apache2handler/sapi_apache2.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions