[gtk] (5 commits) Non-fast-forward update to branch columnview-scrolling

[Matthias Clasen <matthiasc src gnome org>]

The branch 'columnview-scrolling' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  8a9777d... columnview: Revise scroll-minimum handling
  f0579cb... columnview: Implement horizontal scrolling

Commits added to the branch:

  0b8cebd... ffmediafile: Add fixes for recent cflags changes (*)
  00f2b13... columnview: Make sure focus can move into cells (*)
  27ed2cc... Merge branch 'wip/otte/for-master' into 'master' (*)
  befdd8b... columnview: Revise scroll-minimum handling
  f0a0e20... columnview: Implement horizontal scrolling

(*) This commit already existed in another branch; no separate mail sent