gcompris r3210 - in branches/gcomprixogoo: . src/babyshapes-activity/resources/babyshapes src/babyshapes-activity/resources/babyshapes/dog1 src/babyshapes-activity/resources/babyshapes/dog2 src/babyshapes-activity/resources/babyshapes/dog3 src/babyshapes-activity/resources/babyshapes/food

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Mon Jan  7 22:54:23 2008
New Revision: 3210
URL: http://svn.gnome.org/viewvc/gcompris?rev=3210&view=rev

Log:
merge of gcomprisxo commit 3209 fixed missing directory in babyshapes


Added:
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/dog1/Makefile.am
      - copied unchanged from r3209, /branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/dog1/Makefile.am
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/dog2/Makefile.am
      - copied unchanged from r3209, /branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/dog2/Makefile.am
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/dog3/Makefile.am
      - copied unchanged from r3209, /branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/dog3/Makefile.am
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/food/Makefile.am
      - copied unchanged from r3209, /branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/food/Makefile.am
Modified:
   branches/gcomprixogoo/configure.in
   branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/Makefile.am

Modified: branches/gcomprixogoo/configure.in
==============================================================================
--- branches/gcomprixogoo/configure.in	(original)
+++ branches/gcomprixogoo/configure.in	Mon Jan  7 22:54:23 2008
@@ -808,6 +808,10 @@
 src/gnumch-multiples-activity/Makefile
 src/babyshapes-activity/Makefile
 src/babyshapes-activity/resources/babyshapes/Makefile
+src/babyshapes-activity/resources/babyshapes/dog1/Makefile
+src/babyshapes-activity/resources/babyshapes/dog2/Makefile
+src/babyshapes-activity/resources/babyshapes/dog3/Makefile
+src/babyshapes-activity/resources/babyshapes/food/Makefile
 src/babyshapes-activity/resources/Makefile
 src/boards/python/gcompris/utils/Makefile
 src/boards/python/gcompris/score/Makefile

Modified: branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/Makefile.am	(original)
+++ branches/gcomprixogoo/src/babyshapes-activity/resources/babyshapes/Makefile.am	Mon Jan  7 22:54:23 2008
@@ -1,3 +1,4 @@
+SUBDIRS=dog1 dog2 dog3 food
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/babyshapes