diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-03-04 12:11:20 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-03-04 12:11:20 +0100 |
| commit | 33a8e387f58ba955e78e79c4b865dd989213443e (patch) | |
| tree | f169aa9fae3d1278767574d5bffde8c0d90a7c8d /UPGRADING | |
| parent | a29ae8c8f76f6c96bad2cff1007bc037d0307dd3 (diff) | |
| download | php-git-33a8e387f58ba955e78e79c4b865dd989213443e.tar.gz | |
- damned conflicts
Diffstat (limited to 'UPGRADING')
| -rwxr-xr-x | UPGRADING | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -68,28 +68,7 @@ PHP X.Y UPGRADE NOTES 9. New Global Constants ======================================== -<<<<<<< HEAD -======= -- mysqli: - - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options() -- cURL: - - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt(). - -- GD - - Added constants for imageflip: - . IMG_FLIP_HORIZONTAL - . IMG_FLIP_VERTICAL - . IMG_FLIP_BOTH - - Added constants for imagecrop - . IMG_CROP_DEFAULT - . IMG_CROP_TRANSPARENT - . IMG_CROP_BLACK - . IMG_CROP_WHITE - . IMG_CROP_SIDES - . IMG_CROP_THRESHOLD - ->>>>>>> PHP-5.5 ======================================== 10. Changes to INI File Handling ======================================== |