[gnome-bluetooth: 4/4] Merge branch 'Community/Purism/gnome-bluetooth-libhandy-column-name-collision'

[Bastien Nocera <hadess src gnome org>]

commit d16756daed5bf532ce2389e03e837c04810d0c3b
Merge: c201fa71 98618aeb
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Feb 6 17:55:46 2019 +0100

    Merge branch 'Community/Purism/gnome-bluetooth-libhandy-column-name-collision'

 .gitmodules                                   |   3 -
 docs/reference/libgnome-bluetooth/meson.build |   1 +
 lib/bluetooth-hdy-column.c                    | 368 ++++++++++++++++++++++++++
 lib/bluetooth-hdy-column.h                    |  25 ++
 lib/bluetooth-settings-widget.c               |  10 +-
 lib/meson.build                               |   2 +-
 lib/settings.ui                               |   2 +-
 meson.build                                   |  12 -
 po/POTFILES.in                                |   1 +
 po/POTFILES.skip                              |   1 -
 subprojects/libhandy                          |   1 -
 11 files changed, 401 insertions(+), 25 deletions(-)
---