From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 13 Nov 2016 22:17:25 +0000 (+0100)
Subject: Merge branch 'pull-request/2164'
X-Git-Tag: php-7.2.0alpha1~933
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=189bbb586cf600b454178b799773d4f9df8c036c;p=php

Merge branch 'pull-request/2164'
---

189bbb586cf600b454178b799773d4f9df8c036c
diff --cc UPGRADING
index 153d5b2c10,38250ed303..953866a9a1
--- a/UPGRADING
+++ b/UPGRADING
@@@ -46,6 -44,6 +46,10 @@@ PHP 7.2 UPGRADE NOTE
  4. Deprecated Functionality
  ========================================
  
++- GD:
++  . png2wbmp() and jpeg2wbmp() have been deprecated, and will be removed as of
++    PHP 8.0.0.
++
  ========================================
  5. Changed Functions
  ========================================