diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-17 11:57:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-17 11:57:08 +0800 |
| commit | a3940c1867d10f177c46860ed4632d79960f5e82 (patch) | |
| tree | 46c5983cecafb5d84330a40ea26f4e028b0666f3 /ext/mysqlnd/php_mysqlnd.h | |
| parent | b9aed47a7a9a1e9485317b5b0d5c58ff4cec5456 (diff) | |
| parent | fc49f1c41139962030810c7563aab6f325b218e0 (diff) | |
| download | php-git-a3940c1867d10f177c46860ed4632d79960f5e82.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fix build
Fix build
Fix build
prepare for 5.6.20RC1
Fix more emails
More email fixing
Fix emails in headers. @mysql.com addresses are no more since many years.
fix #ifdef usage
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.h')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.h b/ext/mysqlnd/php_mysqlnd.h index 7ee015e291..87e6a75b07 100644 --- a/ext/mysqlnd/php_mysqlnd.h +++ b/ext/mysqlnd/php_mysqlnd.h @@ -12,12 +12,9 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov <andrey@mysql.com> | - | Ulf Wendel <uwendel@mysql.com> | - | Georg Richter <georg@mysql.com> | + | Authors: Andrey Hristov <andrey@php.net> | + | Ulf Wendel <uw@php.net> | +----------------------------------------------------------------------+ - - $Id$ */ #ifndef PHP_MYSQLND_H |