[gnome-screenshot: 2/2] Merge branch 'master' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 4ae67e6c3a1d0352070d9a1672b7dea0c4987dfe
Merge: 2a1a983 37e520f
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Mon Sep 3 23:31:26 2018 +0000

    Merge branch 'master' into 'master'
    
    Clean up formatting. Remove extra whitespace, convert tabs to spaces, fix indentation
    
    See merge request GNOME/gnome-screenshot!1

 src/cheese-flash.c                  |   4 +-
 src/gnome-screenshot.1              |   2 +-
 src/gnome-screenshot.convert        |   2 +-
 src/screenshot-application.c        |  12 +--
 src/screenshot-application.h        |   6 +-
 src/screenshot-area-selection.c     |   6 +-
 src/screenshot-config.h             |  24 ++---
 src/screenshot-dialog.c             |  52 +++++-----
 src/screenshot-dialog.h             |   8 +-
 src/screenshot-filename-builder.c   |  12 +--
 src/screenshot-interactive-dialog.c |  14 +--
 src/screenshot-shadow.c             | 191 ++++++++++++++++++------------------
 src/screenshot-utils.c              |  84 ++++++++--------
 13 files changed, 207 insertions(+), 210 deletions(-)
---