[gnome-initial-setup/shell/4765: 155/362] Merge pull request #36 from endlessm/shell/3371

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

commit d5ab96a902adc7f7d34b0110966d271c4e6bed44
Merge: a133083 58d2ccb
Author: Roddy Shuler <roddy endlessm com>
Date:   Tue Aug 12 15:48:41 2014 -0400

    Merge pull request #36 from endlessm/shell/3371
    
    display: change the wording on the overscan page

 .../pages/display/display-overscan.png             |  Bin 0 -> 26233 bytes
 .../pages/display/display.gresource.xml            |    1 +
 .../pages/display/gis-display-page.c               |   64 +++++++++++---
 .../pages/display/gis-display-page.ui              |   90 ++++++++++++++++----
 4 files changed, 123 insertions(+), 32 deletions(-)
---