From a49cd7851b9cd19f4c1b885b7ffe078e59a82560 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 1 Mar 2015 07:10:26 +0000
Subject: [PATCH] Add an entry to the changelog for `wp_get_mime_types()`
 mentioning that GIMP (xcf) file support was added in 4.2.

See [31578].
Fixes #31146.

Built from https://develop.svn.wordpress.org/trunk@31590


git-svn-id: http://core.svn.wordpress.org/trunk@31571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 1 +
 wp-includes/version.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index b011702f74..41791996fd 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2156,6 +2156,7 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
  * Retrieve list of mime types and file extensions.
  *
  * @since 3.5.0
+ * @since 4.2.0 Support was added for GIMP (xcf) files.
  *
  * @return array Array of mime types keyed by the file extension regex corresponding to those types.
  */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 87c9aeea84..340a640f61 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31589';
+$wp_version = '4.2-alpha-31590';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.