diff options
| author | Felipe Pena <felipensp@gmail.com> | 2014-01-01 09:56:49 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2014-01-01 09:56:49 -0200 |
| commit | 37897e258d13016f80c61b7d6e9054994f2e5e0f (patch) | |
| tree | fa2c276afeda390f4440abfb95bcf264e0a2d33b /ext/json/php_json.h | |
| parent | 5408f1e5a68fead0057c95df57cfb1ff0cc3fe81 (diff) | |
| parent | 49cdde7326c50a5861a0446d6c6647838447595a (diff) | |
| download | php-git-37897e258d13016f80c61b7d6e9054994f2e5e0f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions