DYefremov 53888a45dc Merge branch 'development' into experimental-mac ...

# Conflicts:
#	DemonEditor.desktop
#	README.md
#	app/connections.py
#	app/ui/main_app_window.py
#	app/ui/main_window.glade
#	app/ui/uicommons.py
#	build-deb.sh
#	deb/DEBIAN/control
#	deb/DEBIAN/copyright
#	deb/usr/bin/demon-editor
#	deb/usr/share/applications/DemonEditor.desktop
#	start.py

2020-01-18 23:08:45 +03:00

..

eparser

settings refactoring

2019-12-22 20:42:29 +03:00

tools

added callbacks to the player

2020-01-16 14:08:34 +03:00

ui

Merge branch 'development' into experimental-mac

2020-01-18 23:08:45 +03:00

__init__.py

main module refactoring

2017-11-09 19:01:09 +03:00

commons.py

optional logging

2019-05-12 16:26:19 +03:00

connections.py

minor fixes

2020-01-18 15:28:46 +03:00

settings.py

Merge branch 'development' into experimental-mac

2020-01-18 23:08:45 +03:00