Import a CMakeLists.txt file more portable than the Makefile.
Use -o and -a for conditionnals, and call local bin with ./
Remove the Makefile to avoid confusion.
Reenable looking for cameras at startup (async now)
Change the css depending on the GTK3 version
Merge pull request #799 from pedrocr/fix-gtk3.10-theme

Fix CSS for GTK3 <= 3.13.6
Cleanup GTK3 version checks
Merge branch 'basecurve-tool-fixes' of git://github.com/mazhe/darktable into maze-basecurve-tool-fixes-try2
dt-curve-tool: take care of install destination
dt-curve-tool: helper script is smarter about dt-curve-tool path
dt-curve-tool: add openmp support
Fix compile without camera support
Remove commented out code, identical line just above.
Fix some scrolled windows height.

In Gtk3 it is needed to set the scrolled windows minimum content height.
This fixes the collect images and styles modules.
Merge pull request #801 from darktable-org/fix-gtk3-window-height

Fix some scrolled windows height.
Fix IPTC Keyword reading for real

Back in f855b0999f1101ea112f3e1ad42d4db5e1fc3714 I removed too much.
Draw callbacks: cairo drawing cleanup. Part 1.

Only simplest stuff for now - drop unneeded temporary surfaces.
Might result in slightly smaller memory footprint.
Use gdk_cairo_set_source_rgba() helper

Relevant Coccinelle patch:
@@
expression cr, color;
@@
-cairo_set_source_rgba(cr, color.red, color.green, color.blue, color.alpha);
+gdk_cairo_set_source_rgba(cr, &color);

@@
expression cr, color;
@@
-cairo_set_source_rgba(cr, color->red, color->green, color->blue, color->alpha);
+gdk_cairo_set_source_rgba(cr, color);