aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2018-09-25 08:42:59 +0200
committerHenrik Nord <[email protected]>2018-09-25 08:42:59 +0200
commite6c3dd9f701d354c06b9b1b043a3d7e9cc050b1c (patch)
treea27c6c89bba769d5a6467b0a51df0c9adb8e9e47 /lib/wx
parent494cb3be4a98653c212d673008085bc3ea70dc7e (diff)
parent377f19f25aeec6939a6728bd0c4910086c22ccdc (diff)
downloadotp-e6c3dd9f701d354c06b9b1b043a3d7e9cc050b1c.tar.gz
otp-e6c3dd9f701d354c06b9b1b043a3d7e9cc050b1c.tar.bz2
otp-e6c3dd9f701d354c06b9b1b043a3d7e9cc050b1c.zip
Merge branch 'maint'
Diffstat (limited to 'lib/wx')
-rw-r--r--lib/wx/doc/src/notes.xml15
-rw-r--r--lib/wx/vsn.mk2
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 45638dff35..a925cf30d4 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,21 @@
<p>This document describes the changes made to the wxErlang
application.</p>
+<section><title>Wx 1.8.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed compilation warning on Darwin.</p>
+ <p>
+ Own Id: OTP-15230 Aux Id: PR-1860 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Wx 1.8.4</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 37a5477631..e539ad36f6 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.8.4
+WX_VSN = 1.8.5