Skip to content

Commit

Permalink
Merge pull request #577 from enthought/cherry-pick-one-more-fix
Browse files Browse the repository at this point in the history
Backport #573 to v 7.0 maintenance branch
  • Loading branch information
Poruri Sai Rahul authored Jul 15, 2020
2 parents 40adcf0 + c0f744e commit cbb4089
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ release.

Thanks to:

Kit Choi, Rahul Poruri, Pedro Rivotti, Corran Webster.
Aaron Ayres, Kit Choi, Rahul Poruri, Pedro Rivotti, Corran Webster.

Change summary
--------------

Fixes

* Fix copyright header in AboutDialog. (#573)
* Fix dock pane layout on Qt5. (#545)
* Fix errors from incorrect QImage memory management. (#546)
* Fix CodeWidget handling of parsed tokens which caused TraitsUI CodeEditor to
Expand Down
2 changes: 1 addition & 1 deletion pyface/ui/qt4/about_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
%s
</p>
<p>
Copyright &copy; 2003-2010 Enthought, Inc.<br>
Copyright &copy; 2003-2020 Enthought, Inc.<br>
Copyright &copy; 2007 Riverbank Computing Limited
</p>
</center>
Expand Down

0 comments on commit cbb4089

Please sign in to comment.