Merged with the maintenance branch.

Sat, 19 Nov 2016 14:59:17 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 19 Nov 2016 14:59:17 +0100
changeset 5337
d478270045b2
parent 5332
41b32e1636e1 (current diff)
parent 5336
1a31367a3db2 (diff)
child 5338
b201f26d1722

Merged with the maintenance branch.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
--- a/.hgtags	Fri Nov 18 18:53:31 2016 +0100
+++ b/.hgtags	Sat Nov 19 14:59:17 2016 +0100
@@ -23,3 +23,5 @@
 c8a2140564c49518ee6893c3706cb5db8756474e snapshot-20140628
 c41854faf58371c851308169fe14e542b5d3a4e2 snapshot-20140720
 7c5fef569684f5e7edda2e6bf3c466bc812f8cae release-6.0.0-RC1
+8ff05a7798ac183732bb9fb34cff249c9a4ece69 release-16.11
+112840bac20c339e7de897deebf7b5cf9016cc4e release-16.11.1
--- a/changelog	Fri Nov 18 18:53:31 2016 +0100
+++ b/changelog	Sat Nov 19 14:59:17 2016 +0100
@@ -10,6 +10,9 @@
 - Third Party packages
   -- updated chardet to 2.3.0
 
+Version 16.11.1:
+- fixed a PyQt5 compatibility issue on Windows platforms
+
 Version 16.11:
 - bug fixes
 - General

eric ide

mercurial