summaryrefslogtreecommitdiff
path: root/main/streams/php_stream_plain_wrapper.h
diff options
context:
space:
mode:
authorGustavo Lopes <glopes@nebm.ist.utl.pt>2013-01-22 12:24:33 +0100
committerGustavo Lopes <glopes@nebm.ist.utl.pt>2013-01-22 12:24:33 +0100
commitb8b3bb08b22a28041f5c02b371a88f231ec510de (patch)
treed5d944185b80da3e0d418751a8326476e913d197 /main/streams/php_stream_plain_wrapper.h
parent86c1a26169ce44c9ea48e424b62128ee62f31d59 (diff)
parentaa0adce47d9b8ead59efede63a769e395e27bcd5 (diff)
downloadphp-git-b8b3bb08b22a28041f5c02b371a88f231ec510de.tar.gz
Merge branch 'bug64023' into PHP-5.4
* bug64023: Fix bug #64023 (__toString() & SplFileInfo) Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
Diffstat (limited to 'main/streams/php_stream_plain_wrapper.h')
0 files changed, 0 insertions, 0 deletions