diff options
| author | Anatol Belski <ab@php.net> | 2015-01-21 13:55:07 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-21 13:55:07 +0100 |
| commit | 35bfa022f9005c22c6ff9ac3f0ca8bd23d596261 (patch) | |
| tree | 8f76ad67419c9b2fcbcf84e30076550a011c1ee5 /ext/reflection/php_reflection.h | |
| parent | 71aa0d35663fd732e11edfe3b021f7f27395eed9 (diff) | |
| parent | bd52f4a833ea653d915a27ba07ec83d3e3b74c78 (diff) | |
| download | php-git-35bfa022f9005c22c6ff9ac3f0ca8bd23d596261.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
make timelib_config.h inclusion configurable
Conflicts:
win32/build/config.w32
win32/build/config.w32.phpize.in
Diffstat (limited to 'ext/reflection/php_reflection.h')
0 files changed, 0 insertions, 0 deletions