rfranke 01df366c06 Merge branch 'dev' into issue5867 ...

Conflicts (resolved manually):
	rtdata/languages/default
	rtgui/options.cc

2020-08-11 18:40:47 +02:00

..

dcpprofiles

…

fonts

…

iccprofiles

…

images

…

languages

Merge branch 'dev' into issue5867

2020-08-11 18:40:47 +02:00

options

…

profiles

…

sounds

…

themes

…

CMakeLists.txt

…

mime-types

…

rawtherapee.desktop.in

…