[eog: 6/6] Merge branch 'gestures'

[Felix Riemann <friemann src gnome org>]

commit c5d4eadb0b4e3de979352a86f866f4b4768c5d21
Merge: 89c16b8 4cbd2d3
Author: Felix Riemann <friemann gnome org>
Date:   Wed Aug 13 21:05:03 2014 +0200

    Merge branch 'gestures'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730656

 src/eog-scroll-view.c |  315 ++++++++++++++++++++++++++++++++++++++++++++++++-
 src/eog-scroll-view.h |    3 +
 src/eog-window.c      |   34 ++++++
 3 files changed, 350 insertions(+), 2 deletions(-)
---