[gnome-initial-setup/shell/4765: 139/362] Merge pull request #31 from endlessm/shell/3020

[Jasper St. Pierre <jstpierre src gnome org>]

commit c04d625aa6b9d6e477c29850d6e4a82af75bc933
Merge: 23ff38c de05509
Author: P. F. Chimento <philip chimento gmail com>
Date:   Thu Aug 7 15:29:35 2014 -0700

    Merge pull request #31 from endlessm/shell/3020
    
    Add a "Display" page to the FBE
    
    [endlessm/eos-shell#3020]

 configure.ac                                       |    1 +
 gnome-initial-setup/Makefile.am                    |    1 +
 gnome-initial-setup/gnome-initial-setup.c          |    3 +
 gnome-initial-setup/pages/Makefile.am              |    1 +
 gnome-initial-setup/pages/display/.gitignore       |    1 +
 gnome-initial-setup/pages/display/Makefile.am      |   27 +++
 .../pages/display/display.gresource.xml            |    7 +
 .../pages/display/gis-display-page.c               |  216 ++++++++++++++++++++
 .../pages/display/gis-display-page.h               |   57 +++++
 .../pages/display/gis-display-page.ui              |   84 ++++++++
 po/POTFILES.in                                     |    2 +
 po/gnome-initial-setup.pot                         |   30 +++-
 12 files changed, 427 insertions(+), 3 deletions(-)
---