diff options
| author | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-20 19:46:44 +0200 |
| commit | 132cd8be0d13eaeee200cfa09b0596f6619c6a7e (patch) | |
| tree | 7a928718769260e60252c0e048d2f10d0cd94f8c /php.ini-development | |
| parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
| parent | 268bcdc1cb668f76b85a84bc4d32194548cc185a (diff) | |
| download | php-git-132cd8be0d13eaeee200cfa09b0596f6619c6a7e.tar.gz | |
Merge branch 'pull-request/805'
* pull-request/805:
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/php.ini-development b/php.ini-development index 562816fc44..41460485c7 100644 --- a/php.ini-development +++ b/php.ini-development @@ -867,8 +867,8 @@ default_socket_timeout = 60 ; ; Windows Extensions ; Note that ODBC support is built in, so no dll is needed for it. -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) -; extension folders as well as the separate PECL DLL download (PHP 5). +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+) +; extension folders as well as the separate PECL DLL download (PHP 5+). ; Be sure to appropriately set the extension_dir directive. ; ;extension=php_bz2.dll |