diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-01-03 22:59:38 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-01-03 22:59:38 +0100 |
| commit | aaecb99c6bede3c0d9e1a90ff5237ec49652fc01 (patch) | |
| tree | 17c725c236787fc4a2640a528101784800ca4e49 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 7ed2fdbf99219c39e7ac24658905f736c62efe0b (diff) | |
| parent | 712710bfecb2e421306246f2e179727f0494a019 (diff) | |
| download | php-git-aaecb99c6bede3c0d9e1a90ff5237ec49652fc01.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions