Mercurial Repositories > eric / changeset
changeset
Merged with default branch to prepare 18.06 release.
Sat, 02 Jun 2018 12:44:41 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 02 Jun 2018 12:44:41 +0200
- branch
- maintenance
- changeset 6319
- df201b9fbad4
- parent 6274
- 44249d49d892 (diff)
- parent 6318
- 17df7a729d94 (current diff)
- child 6320
- 4c45d163c6ac
Merged with default branch to prepare 18.06 release.
--- a/.hgtags Sat Jun 02 12:42:59 2018 +0200 +++ b/.hgtags Sat Jun 02 12:44:41 2018 +0200 @@ -25,3 +25,27 @@ 7c5fef569684f5e7edda2e6bf3c466bc812f8cae release-6.0.0-RC1 8ff05a7798ac183732bb9fb34cff249c9a4ece69 release-16.11 112840bac20c339e7de897deebf7b5cf9016cc4e release-16.11.1 +d2bef1e78194dabd24defbac1179bb2b6372cc2a release-16.12 +5e79ebb03b102c47038b3c568495f9aa511d5584 release-17.01 +b46f68bbd6b4ac06790feb4713fb6e2b04fe4882 release-17.02 +b46f68bbd6b4ac06790feb4713fb6e2b04fe4882 release-17.02 +3ad8620b828b6d8490891c8898e9a16dee50a866 release-17.02 +3790c6f62c5cad71a8c560c0bd8849da4f9dd5e5 release-17.02.1 +106581f40cc26a68ceb8d995828dca004d7dbf3a release-17.03 +63eb46a7c3e8b5c7a38bb100438bd1e6c4c4f9de release-17.03.1 +be30320a29bccd9dd4019ad36cc4aeffa48437d3 release-17.04 +27f8227ba598052663c6b2f40bcdad866f7473f1 release-17.04.1 +6422afc7adc4ec10f7b8eeea13ff207989cc03ba release-17.05 +1860eca908e4ce5c8256c5cfdd51d8f950301063 release-17.06 +49ba4a9f04215068aea6c5a51634b1445250326b release-17.07 +9487c08b6a23001f6d251623d7f30f58511cf85a release-17.08 +0752bdd8db779f43dd2d973651650169d4e0a8a4 release-17.09 +5228afbb870f86fa5fd187f7065c8f7ba0187fe6 release-17.10 +7fa6400debb4015b16cba425a2ab0d9f7848c569 release-17.11 +a604749f4fcc8762d769243f8e35854c75df8708 release-17.11.1 +548a9ba8c97052fd5dda3faba9ae2e341d289092 release-17.12 +bfc5153d02243ee750035c97029e381a0af26578 release-18.01 +55bb393343226408a330aca14d4270aed217d53c release-18.02 +89dc65b937cc6c04eccb0bfa70cff7408607fb83 release-18.03 +a02b03b7bfec915a89b53ba95a3fb26485561d2b release-18.04 +0daf79d65080a4d8119dc2b9debc54031a9f75cf release-18.05
--- a/UI/UserInterface.py Sat Jun 02 12:42:59 2018 +0200 +++ b/UI/UserInterface.py Sat Jun 02 12:44:41 2018 +0200 @@ -602,9 +602,8 @@ self.inCloseEvent = False # now redirect stdout and stderr - # TODO: release - reenable redirection -## sys.stdout = self.stdout -## sys.stderr = self.stderr + sys.stdout = self.stdout + sys.stderr = self.stderr # now fire up the single application server if Preferences.getUI("SingleApplicationMode"):
