diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-23 11:23:00 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-23 11:23:00 +0100 |
| commit | 5256ffd4fe35c2abe83d0229226324362440374e (patch) | |
| tree | dc96b87e602fe2454c28dbb79d277856fadc54db /ext/mysql/php_mysql.c | |
| parent | ee2f749a22f23ac0c240de3bcc496f37785cecb9 (diff) | |
| parent | 1bfbb546f761266a769a3f1f85c26802cc7996a1 (diff) | |
| download | php-git-5256ffd4fe35c2abe83d0229226324362440374e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
curl: add new proxy constants
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions