DYefremov 137ee213dc Merge branch 'development-mac' into experimental-win ...

# Conflicts:
#	app/tools/media.py
#	app/ui/app_menu_bar.ui
#	app/ui/main_app_window.py
#	app/ui/main_window.glade
#	app/ui/settings_dialog.py

2021-04-26 10:57:45 +03:00

..

eparser

Merge branch 'development-mac' into experimental-win

2021-04-02 21:51:05 +03:00

tools

Merge branch 'development-mac' into experimental-win

2021-04-26 10:57:45 +03:00

ui

Merge branch 'development-mac' into experimental-win

2021-04-26 10:57:45 +03:00

__init__.py

main module refactoring

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

commons.py

adaptation to Python 3.4

2021-02-23 11:10:06 +03:00

connections.py

some minor fixes

2021-03-06 14:32:33 +03:00

settings.py

Merge branch 'development-mac' into experimental-win

2021-04-26 10:57:45 +03:00