[nautilus: 2/2] Merge branch 'drop-x11-xf86keysym-h' into 'master'

[Carlos Soriano <csoriano src gnome org>]

commit 22917637cb2dae59bb7e5b261992f753480db0bd
Merge: bb595c3a7 2ea3a8ccb
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Thu Dec 14 10:54:20 2017 +0000

    Merge branch 'drop-x11-xf86keysym-h' into 'master'
    
    general: Get key values from gdk/gdkkeysyms.h, not X11/XF86keysym.h
    
    See merge request GNOME/nautilus!38

 config.h.meson            |  1 -
 meson.build               |  4 ----
 src/nautilus-files-view.c | 12 ++----------
 src/nautilus-window.c     | 29 ++++++++++++-----------------
 4 files changed, 14 insertions(+), 32 deletions(-)
---