[gnome-games: 3/3] Merge branch 'gnomine-vala'

[Robert Ancell <rancell src gnome org>]

commit 2886631af791cf52f1c5f9204b24203c05be2b88
Merge: d23edc3 905f8f3
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Nov 13 17:53:27 2011 +1100

    Merge branch 'gnomine-vala'
    
    Conflicts:
    	gnomine/gnomine.c

 configure.in                                       |    6 +-
 gnomine/Makefile.am                                |   64 +-
 gnomine/data/Makefile.am                           |   24 +
 gnomine/{ => data}/bang.svg                        |    0
 gnomine/{ => data}/face-cool.svg                   |    0
 gnomine/{ => data}/face-sad.svg                    |    0
 gnomine/{ => data}/face-smile.svg                  |    0
 gnomine/{ => data}/face-win.svg                    |    0
 gnomine/{ => data}/face-worried.svg                |    0
 gnomine/{ => data}/flag-question.svg               |    0
 gnomine/{ => data}/flag.svg                        |    0
 gnomine/{ => data}/gnomine.6                       |    0
 gnomine/{ => data}/gnomine.desktop.in.in           |    0
 gnomine/{ => data}/mine.svg                        |    0
 .../{ => data}/org.gnome.gnomine.gschema.xml.in    |    2 +-
 gnomine/{ => data}/warning.svg                     |    0
 gnomine/gnomine.c                                  | 1160 ---------------
 gnomine/minefield.c                                | 1474 --------------------
 gnomine/minefield.h                                |  124 --
 gnomine/src/Makefile.am                            |   52 +
 gnomine/src/gnomine.vala                           |  804 +++++++++++
 gnomine/src/minefield-view.vala                    |  603 ++++++++
 gnomine/src/minefield.vala                         |  333 +++++
 libgames-support/GnomeGamesSupport-1.0.vapi        |    3 +-
 po/POTFILES.in                                     |    8 +-
 25 files changed, 1829 insertions(+), 2828 deletions(-)
---