[gnome-games: 2/2] Merge branch 'quadrapassel-gsettings'

[Robert Ancell <rancell src gnome org>]

commit d0cf57e77975517b65c391cf9044d82a5055a195
Merge: 6339255 d43d333
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Jan 2 22:06:22 2012 +1100

    Merge branch 'quadrapassel-gsettings'

 libgames-support/games-controls.c                  |   87 ++++++--
 libgames-support/games-controls.h                  |    1 +
 quadrapassel/data/Makefile.am                      |   21 +--
 .../data/org.gnome.quadrapassel.gschema.xml.in     |   99 +++++++++
 quadrapassel/data/quadrapassel.schemas.in          |  222 --------------------
 quadrapassel/src/main.cpp                          |    5 -
 quadrapassel/src/scoreframe.cpp                    |    8 +-
 quadrapassel/src/tetris.cpp                        |  129 +++++-------
 quadrapassel/src/tetris.h                          |   37 +---
 9 files changed, 230 insertions(+), 379 deletions(-)
---