diff options
| author | Julien Pauli <jpauli@php.net> | 2015-09-30 13:19:18 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-09-30 13:19:18 +0200 |
| commit | 0fd71d1184727ac31c1ab06bef140650a06e35b3 (patch) | |
| tree | e5b481f9cff5e1c1b8835f9aca2a263872dc086f /main/php.h | |
| parent | 07a8e5ce37140690cd179d0c3ae034bd4ae718cd (diff) | |
| parent | d7fb43e30d662c7fff999521ebf15ddbb192c7ca (diff) | |
| download | php-git-0fd71d1184727ac31c1ab06bef140650a06e35b3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test
5.5.31 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions