Ingo Weyrich 90005b0663 Fix more relicts from merge conflict

2020-06-27 15:21:50 +02:00

..

dcpprofiles

…

fonts

…

iccprofiles

…

images

Merge from branch 'dev'

2020-05-04 14:07:45 -07:00

languages

…

options

…

profiles

Use capture sharpening for pixelshift profiles

2019-11-24 23:09:23 +01:00

sounds

…

themes

Merge remote-tracking branch 'dev/newlocallab' into newlocallab

2020-04-24 09:58:35 +02:00

CMakeLists.txt

…

mime-types

…

rawtherapee.desktop.in

…