[gtk: 2/2] Merge branch 'module-reorg' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 3ee4d6fc0ff0413166353a09f01708222887354b
Merge: da8e83f9cb a78e9f2261
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Mar 11 16:47:43 2018 +0000

    Merge branch 'module-reorg' into 'master'
    
    Consolidate print backends into one directory
    
    See merge request GNOME/gtk!53

 modules/printbackends/cloudprint/meson.build       | 11 ----
 modules/printbackends/cups/meson.build             | 22 -------
 modules/printbackends/file/meson.build             | 10 ----
 .../{cloudprint => }/gtkcloudprintaccount.c        |  0
 .../{cloudprint => }/gtkcloudprintaccount.h        |  0
 .../printbackends/{cups => }/gtkcupssecretsutils.c |  0
 .../printbackends/{cups => }/gtkcupssecretsutils.h |  0
 modules/printbackends/{cups => }/gtkcupsutils.c    |  0
 modules/printbackends/{cups => }/gtkcupsutils.h    |  0
 .../{cloudprint => }/gtkprintbackendcloudprint.c   |  0
 .../{cloudprint => }/gtkprintbackendcloudprint.h   |  0
 .../printbackends/{cups => }/gtkprintbackendcups.c |  0
 .../printbackends/{cups => }/gtkprintbackendcups.h |  0
 .../printbackends/{file => }/gtkprintbackendfile.c |  0
 .../printbackends/{file => }/gtkprintbackendfile.h |  0
 .../printbackends/{lpr => }/gtkprintbackendlpr.c   |  0
 .../printbackends/{lpr => }/gtkprintbackendlpr.h   |  0
 .../{cloudprint => }/gtkprintercloudprint.c        |  0
 .../{cloudprint => }/gtkprintercloudprint.h        |  0
 modules/printbackends/{cups => }/gtkprintercups.c  |  0
 modules/printbackends/{cups => }/gtkprintercups.h  |  0
 modules/printbackends/lpr/meson.build              | 10 ----
 modules/printbackends/meson.build                  | 68 +++++++++++++++++++++-
 23 files changed, 65 insertions(+), 56 deletions(-)
---