diff options
author | Xinchen Hui <laruence@php.net> | 2012-10-09 13:29:51 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2012-10-09 13:29:51 +0800 |
commit | e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 (patch) | |
tree | d43f1db77088eedc669c2027e80355f7cdfa06f9 /main/php_streams.h | |
parent | 931571260b28bec7c53e57803e03ee0c38e8595e (diff) | |
parent | 6284ef112ef870b791b8dfab36a39c4664744cc5 (diff) | |
download | php-git-e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'main/php_streams.h')
-rw-r--r--[-rwxr-xr-x] | main/php_streams.h | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index 82498d6619..82498d6619 100755..100644 --- a/main/php_streams.h +++ b/main/php_streams.h |