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 | |
| 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')
| -rw-r--r--[-rwxr-xr-x] | main/php_streams.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | main/streams/glob_wrapper.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | main/streams/php_stream_glob_wrapper.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | main/streams/streams.c | 0 |
4 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 diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index 7b568501ee..7b568501ee 100755..100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c diff --git a/main/streams/php_stream_glob_wrapper.h b/main/streams/php_stream_glob_wrapper.h index c584ff8f84..c584ff8f84 100755..100644 --- a/main/streams/php_stream_glob_wrapper.h +++ b/main/streams/php_stream_glob_wrapper.h diff --git a/main/streams/streams.c b/main/streams/streams.c index e9c2e07320..e9c2e07320 100755..100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c |