diff options
| author | Julien Pauli <jpauli@php.net> | 2015-09-02 17:55:20 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-09-02 17:55:20 +0200 |
| commit | bb98ed600ab6787d9d367927d49439be9a83441e (patch) | |
| tree | e9dc9908060cbf9772b9499a2a58e2ae44bc4e63 /ext/json/php_json.h | |
| parent | ea807f9c07e841ff1a3fbfbada1423d66731ad7b (diff) | |
| parent | a12cef979db2466dd98d46cffd0a32c6eb2957c3 (diff) | |
| download | php-git-bb98ed600ab6787d9d367927d49439be9a83441e.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Merge branch 'PHP-5.6'
bump version
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions