[gcompris: 110/111] Merge branch 'serahmaster'

[Bruno Coudoin <bcoudoin src gnome org>]

commit 2525855608dd9144cbb487d1c0cc09cb10ce8503
Merge: a1e5c0c ec1e7e5
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Thu Oct 4 00:39:31 2012 +0200

    Merge branch 'serahmaster'

 configure.ac                                       |    4 +
 src/color_mix-activity/.gitignore                  |    1 +
 src/color_mix-activity/Makefile.am                 |   34 +
 src/color_mix-activity/color_mix.py                |  416 +
 src/color_mix-activity/color_mix.svg               |   63 +
 src/color_mix-activity/color_mix.xml.in            |   24 +
 src/color_mix-activity/gcompris                    |    1 +
 src/color_mix-activity/init_path.sh                |    9 +
 src/color_mix-activity/resources/Makefile.am       |    2 +
 .../resources/color_mix/Makefile.am                |   12 +
 .../resources/color_mix/background.jpg             |  Bin 0 -> 74754 bytes
 .../resources/color_mix/cyan_tube.png              |  Bin 0 -> 27128 bytes
 .../resources/color_mix/magenta_tube.png           |  Bin 0 -> 11040 bytes
 .../resources/color_mix/torch_blue.png             |  Bin 0 -> 25788 bytes
 .../resources/color_mix/torch_green.png            |  Bin 0 -> 28830 bytes
 .../resources/color_mix/torch_red.png              |  Bin 0 -> 31292 bytes
 .../resources/color_mix/yellow_tube.png            |  Bin 0 -> 22644 bytes
 src/color_mix_light-activity/.gitignore            |    1 +
 src/color_mix_light-activity/Makefile.am           |   33 +
 src/color_mix_light-activity/color_mix_light.py    |  141 +
 src/color_mix_light-activity/color_mix_light.svg   |  503 +
 .../color_mix_light.xml.in                         |   24 +
 src/color_mix_light-activity/gcompris              |    1 +
 src/color_mix_light-activity/init_path.sh          |    9 +
 src/gnumch-factors-activity/Makefile.am            |    1 +
 src/intro_gravity-activity/.gitignore              |    1 +
 src/intro_gravity-activity/Makefile.am             |   35 +
 src/intro_gravity-activity/gcompris                |    1 +
 src/intro_gravity-activity/init_path.sh            |    9 +
 src/intro_gravity-activity/initial_intro_gravity   |  381 +
 src/intro_gravity-activity/intro_gravity.py        |  449 +
 src/intro_gravity-activity/intro_gravity.svg       |   70 +
 src/intro_gravity-activity/intro_gravity.xml.in    |   29 +
 src/intro_gravity-activity/resources/Makefile.am   |    1 +
 .../resources/intro_gravity/Makefile.am            |   18 +
 .../resources/intro_gravity/README                 |    3 +
 .../resources/intro_gravity/asteroid0.jpg          |  Bin 0 -> 1677 bytes
 .../resources/intro_gravity/asteroid1.jpg          |  Bin 0 -> 2260 bytes
 .../resources/intro_gravity/asteroid2.jpg          |  Bin 0 -> 9184 bytes
 .../resources/intro_gravity/asteroid3.jpg          |  Bin 0 -> 3084 bytes
 .../resources/intro_gravity/asteroid4.jpg          |  Bin 0 -> 1027 bytes
 .../resources/intro_gravity/background.svg         |27578 ++++++++++++++++++++
 .../resources/intro_gravity/crash.png              |  Bin 0 -> 9981 bytes
 .../resources/intro_gravity/neptune.png            |  Bin 0 -> 12341 bytes
 .../resources/intro_gravity/saturn.png             |  Bin 0 -> 12418 bytes
 .../resources/intro_gravity/tux_spaceship.png      |  Bin 0 -> 5083 bytes
 src/land_safe-activity/.gitignore                  |    1 +
 src/land_safe-activity/Makefile.am                 |   35 +
 src/land_safe-activity/gcompris                    |    1 +
 src/land_safe-activity/init_path.sh                |    9 +
 src/land_safe-activity/land_safe.py                |  569 +
 src/land_safe-activity/land_safe.svg               |  151 +
 src/land_safe-activity/land_safe.xml.in            |   25 +
 src/land_safe-activity/resources/Makefile.am       |    2 +
 .../resources/land_safe/Makefile.am                |   22 +
 src/land_safe-activity/resources/land_safe/README  |    3 +
 .../resources/land_safe/background1.jpg            |  Bin 0 -> 12809 bytes
 .../resources/land_safe/background2.jpg            |  Bin 0 -> 11792 bytes
 .../resources/land_safe/background3.jpg            |  Bin 0 -> 13063 bytes
 .../resources/land_safe/background4.jpg            |  Bin 0 -> 53189 bytes
 .../resources/land_safe/crash.png                  |  Bin 0 -> 26226 bytes
 .../resources/land_safe/flame1.png                 |  Bin 0 -> 1662 bytes
 .../resources/land_safe/flame2.png                 |  Bin 0 -> 2402 bytes
 .../resources/land_safe/flame3.png                 |  Bin 0 -> 2808 bytes
 .../resources/land_safe/flame_left.png             |  Bin 0 -> 840 bytes
 .../resources/land_safe/flame_right.png            |  Bin 0 -> 903 bytes
 .../resources/land_safe/land1.png                  |  Bin 0 -> 117358 bytes
 .../resources/land_safe/land2.png                  |  Bin 0 -> 101790 bytes
 .../resources/land_safe/land3.png                  |  Bin 0 -> 20522 bytes
 .../resources/land_safe/land4.png                  |  Bin 0 -> 340801 bytes
 .../resources/land_safe/landing_area_green.png     |  Bin 0 -> 5297 bytes
 .../resources/land_safe/landing_area_red.png       |  Bin 0 -> 3590 bytes
 .../resources/land_safe/rocket.png                 |  Bin 0 -> 6118 bytes
 src/place_your_satellite-activity/.gitignore       |    1 +
 src/place_your_satellite-activity/Makefile.am      |   35 +
 src/place_your_satellite-activity/gcompris         |    1 +
 src/place_your_satellite-activity/init_path.sh     |    9 +
 .../place_your_satellite.py                        |  451 +
 .../place_your_satellite.svg                       |   64 +
 .../place_your_satellite.xml.in                    |   22 +
 .../resources/Makefile.am                          |    2 +
 .../resources/place_your_satellite/Makefile.am     |   12 +
 .../resources/place_your_satellite/background.jpg  |  Bin 0 -> 13641 bytes
 .../resources/place_your_satellite/crash.png       |  Bin 0 -> 3167 bytes
 .../resources/place_your_satellite/planet1.png     |  Bin 0 -> 10260 bytes
 .../resources/place_your_satellite/planet2.png     |  Bin 0 -> 24056 bytes
 .../resources/place_your_satellite/planet3.png     |  Bin 0 -> 12607 bytes
 .../resources/place_your_satellite/planet4.png     |  Bin 0 -> 38454 bytes
 .../resources/place_your_satellite/satellite.png   |  Bin 0 -> 3571 bytes
 89 files changed, 31269 insertions(+), 0 deletions(-)
---