[gnome-session: 2/2] Merge branch 'absolute-desktop' into 'master'

[Ray Strode <halfline src gnome org>]

commit 15df261eea79b685deebb582e64d69409f3a811a
Merge: d335d646 ebe5a2ef
Author: Ray Strode <halfline gmail com>
Date:   Tue Aug 28 20:43:39 2018 +0000

    Merge branch 'absolute-desktop' into 'master'
    
    data: use absolute paths in desktop files
    
    See merge request GNOME/gnome-session!5

 data/gnome-custom-session.desktop.in               |  5 --
 data/gnome-custom-session.desktop.in.in            |  5 ++
 ...me-xorg.desktop.in => gnome-xorg.desktop.in.in} |  4 +-
 data/{gnome.desktop.in => gnome.desktop.in.in}     |  4 +-
 data/meson.build                                   | 82 +++++++++++-----------
 5 files changed, 51 insertions(+), 49 deletions(-)
---