[gnome-initial-setup/shell/4765: 302/362] Merge pull request #72 from endlessm/shell/4213

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

commit 0ae596ec838cddef062a519a2ec1d252312d874c
Merge: 7ed5704 1377e06
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Dec 8 13:41:08 2014 -0800

    Merge pull request #72 from endlessm/shell/4213
    
    Shell/4213

 .../pages/keyboard/cc-keyboard-detector.c          |   40 ++++++++++++++++++--
 .../keyboard/{ => detector-trees/C}/pc105.tree     |    6 ---
 .../pages/keyboard/detector-trees/es/pc105.tree    |   29 ++++++++++++++
 .../pages/keyboard/detector-trees/pt/pc105.tree    |   29 ++++++++++++++
 .../pages/keyboard/keyboard.gresource.xml          |    4 +-
 5 files changed, 97 insertions(+), 11 deletions(-)
---