diff options
| author | Anatol Belski <ab@php.net> | 2015-04-28 14:38:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-28 14:38:45 +0200 |
| commit | 7ccafe40c27336d5770d9158a522a7bc72b355f7 (patch) | |
| tree | 35315620d85a175bddb8823e9f2c2c1d39cd77b5 /ext/mysqli/php_mysqli.h | |
| parent | e645837ba15185cc3220d9d7fcc6d23e115ad188 (diff) | |
| parent | 768bbedf8233dad6c1709b536f8db20d4496a7cc (diff) | |
| download | php-git-7ccafe40c27336d5770d9158a522a7bc72b355f7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix VC9 build with PCRE
Revert "Fix segfault in ext/date since 957aa2"
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
0 files changed, 0 insertions, 0 deletions