diff options
| author | Ferenc Kovacs <tyra3l@gmail.com> | 2013-11-06 10:46:34 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyra3l@gmail.com> | 2013-11-06 10:46:34 +0100 |
| commit | 91108818e1554ed542a13148e6d8b79e29e77935 (patch) | |
| tree | 5a7214613ac0da55f6b23c615e900332be31b9fb /main/php.h | |
| parent | 9d75b9fb27cd93c19cd168a486ab2efe2ce2aa78 (diff) | |
| parent | 8b6b39fdcffc8486fedd391b8d8aa7700f0c7f93 (diff) | |
| download | php-git-91108818e1554ed542a13148e6d8b79e29e77935.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions