diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-05-18 23:43:59 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-05-18 23:43:59 -0700 |
| commit | fa6aaf8c03df74aeb45cefd3e961583155fa31c8 (patch) | |
| tree | d9cbcfa24e1a61c7a8e739e373b32a3b995715bb /sapi/phpdbg/phpdbg_help.c | |
| parent | b1c944dfd2889e3a3517c404812d20abe5ce92e6 (diff) | |
| parent | adc070ca995384e4de83fa3446c6dfcf946a3f50 (diff) | |
| download | php-git-fa6aaf8c03df74aeb45cefd3e961583155fa31c8.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix typo in ODBC code
Fix bug #67060: use default mode of 660
Conflicts:
ext/odbc/php_odbc.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions