From 0be596bde2750d187df0c8ee334ace8b749f928a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 4 Mar 2016 14:49:40 +0100
Subject: [PATCH] Move micro version in the change log under the correct
 version

It was wrongly merged under 3.1.0 in aa766062872b02cd9684fd2f1e4837e2cc31d33e,
move it under 3.1.1 (and reword slightly).
---
 docs/changes.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index e01e2cfe40..b90c896d10 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -55,6 +55,11 @@ Changes in behaviour which may result in build errors
 3.1.1: (not released yet)
 ----------------------------
 
+All:
+
+- Add support for the micro version (third component) to OS and toolkit version
+  functions. See wxGetOsVersion(), wxPlatformInfo, and wxAppTraits.
+
 wxMSW:
 
 - Fix crash when using wxCHMHelpController() in 64 bit builds (Xlord2).
@@ -104,8 +109,6 @@ All:
 - Fix wxStringTokenizer copy ctor and assignment operator.
 - Added wxASSERT_MSG_AT() and wxFAIL_MSG_AT() macros.
 - Accept replacement character in wxString::ToAscii() (Stefano D. Mtangoo).
-- Add parameter to get the micro version to OS and toolkit version
-  functions. See wxGetOsVersion(), wxPlatformInfo, and wxAppTraits.
 
 Unix: