Veronica K. B. Olsen 717e4aba78 Fix merge conflicts

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

..

__init__.py

Fix merge conflicts

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

configeditor.py

Change the method the document is rehighlighted. This is significantly faster

2019-11-19 21:49:11 +01:00

docmerge.py

Clarified dropdown options on split document dialog

2020-02-09 20:45:36 +01:00

docsplit.py

Also saving options for DocSplit dialog

2020-02-19 20:08:27 +01:00

export.py

Also saving options for DocSplit dialog

2020-02-19 20:08:27 +01:00

itemeditor.py

Cleanup of imports

2020-02-17 13:30:26 +01:00

projecteditor.py

Cleanup of imports

2020-02-17 13:30:26 +01:00

projectload.py

A few tweaks to the dialog and code

2020-02-26 18:02:37 +01:00

sessionlog.py

Also saving options for DocSplit dialog

2020-02-19 20:08:27 +01:00