Veronica K. B. Olsen 717e4aba78 Fix merge conflicts

2020-02-27 00:19:18 +01:00

..

dialogs

Fix merge conflicts

2020-02-27 00:19:18 +01:00

elements

Fix merge conflicts

2020-02-27 00:19:18 +01:00

tools

Fix the highlighting of synopsis tag

2019-11-20 19:09:32 +01:00

__init__.py

Fix merge conflicts

2020-02-27 00:19:18 +01:00

icons.py

Added the main dialog class for project management, and made some changes to the icon class.

2020-02-26 15:30:08 +01:00

mainmenu.py

Fix merge conflicts

2020-02-27 00:19:18 +01:00

statusbar.py

We should read back the language dictionary setting from the spell class before updating status bar

2019-11-15 21:39:06 +01:00

theme.py

Fix the highlighting of synopsis tag

2019-11-20 19:09:32 +01:00