diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-09 13:30:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-09 13:30:22 +0800 |
| commit | 75a2c0d71555a432db170b37720a4f3b4cd8f224 (patch) | |
| tree | 3de128d1be145966b25f82396f3a88ad97693867 /main | |
| parent | 14bfd3126c324861c1cbccb702c7cd5d3d6308ee (diff) | |
| parent | e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 (diff) | |
| download | php-git-75a2c0d71555a432db170b37720a4f3b4cd8f224.tar.gz | |
Merge branch '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 291fd0d0ae..291fd0d0ae 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 81bf59446f..81bf59446f 100755..100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c |