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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 5dc3637246a15f6c47946f3a2bda9af42272f069
Merge: 69eec3d c72a00a
Author: Michael Catanzaro <mcatanzaro posteo net>
Date:   Fri Dec 7 22:38:45 2018 +0000

    Merge branch 'shortcuts' into 'master'
    
    Add Keyboard Shortcuts overlay
    
    See merge request GNOME/gnome-mahjongg!6

 data/gnome-mahjongg.gresource.xml |  6 +++
 data/help-overlay.ui              | 87 +++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                    |  1 +
 src/gnome-mahjongg.vala           |  1 +
 src/meson.build                   |  6 ++-
 5 files changed, 100 insertions(+), 1 deletion(-)
---