rawdenoise: better user experience for preview image when blending
rawdenoise: apply gaussian blur to preview buffer for a closer visual match
Flip IOP: fix legacy presets update
It was broken because there was no image loaded
Revert "mipmap cache: safety margin around full buffers. avoids deadlocks for me."

This reverts commit f225278d7981fefdaf9ae1c205d33dbd06f619c1.
Fix #10222: Add plural forms to 2 strings
Update French translation.
Break OSX (aka: add an OBJC file for OSX compiles)
Revert "OSX HiDPI: update package building instructions"

This reverts commit ff955eae31a5a53876f65841c41b1ce1bb2174b5.
OSX HiDPI: move PPD detection from GTK patch to in-tree file
OSX: rework the mess that was start script
Show option for txt overlay in prefs
[lua] add a callback when the mouse hover changes

... and bump the api version
TODO: add documentation
Merge branch 'master' of ssh://github.com/darktable-org/darktable
[lua] Add documentation for the has_txt field
Exposure IOP: enable soft boundaries for black
contributors fixups

Ger/MRIG are all Ger Siemerink :)
Update README.md
Merge pull request #786 from ovr/patch-1

Update README.md
opencl: implement redmine issue #10219 (add a few items to nvidia_gpus.h)
Merge branch 'master' into rawdenoise_preview

Conflicts:
	src/develop/blend.c
	src/iop/rawdenoise.c