Merge branch 'master' into release-prep

# Conflicts:
#	CHANGES.rst
This commit is contained in:
Robin Dunn
2017-09-12 21:01:02 -07:00
13 changed files with 61 additions and 45 deletions

View File

@@ -92,6 +92,8 @@ Changes in this release include the following:
* Fix integer division bug in ultimatelistctrl. (#528)
* Fix bug in wx.SearchCtrl.SetCancelBitmap (#532)