Files
DemonEditor/app/tools
DYefremov 5b12777223 Merge branch 'development-mac' into experimental-win
# Conflicts:
#	DemonEditor.spec
#	app/tools/media.py
#	app/ui/dialogs.glade
#	app/ui/main_app_window.py
#	app/ui/main_window.glade
#	app/ui/satellites_dialog.glade
#	app/ui/settings_dialog.glade
#	app/ui/settings_dialog.py
#	app/ui/uicommons.py
2021-04-02 21:51:05 +03:00
..
2018-04-23 14:42:41 +03:00
2019-06-04 13:06:02 +03:00
2021-03-23 22:20:49 +03:00
2021-03-23 22:20:49 +03:00
2021-04-01 23:00:18 +03:00
2019-12-07 21:06:18 +03:00