[Tux4kids-commits] r606 - in tuxmath/trunk: data/images/factroids data/missions/campaign data/missions/campaign/ace data/missions/campaign/cadet data/missions/campaign/commando data/missions/campaign/ranger data/missions/campaign/scout src

[tholy-guest at alioth.debian.org]

Author: tholy-guest
Date: 2008-08-11 15:48:50 +0000 (Mon, 11 Aug 2008)
New Revision: 606

Modified:
   tuxmath/trunk/data/images/factroids/
   tuxmath/trunk/data/images/factroids/Makefile.in
   tuxmath/trunk/data/missions/campaign/
   tuxmath/trunk/data/missions/campaign/ace/
   tuxmath/trunk/data/missions/campaign/cadet/
   tuxmath/trunk/data/missions/campaign/commando/
   tuxmath/trunk/data/missions/campaign/ranger/
   tuxmath/trunk/data/missions/campaign/scout/
   tuxmath/trunk/src/credits.c
   tuxmath/trunk/src/tuxmath.h
Log:
1. Add Brendan & Jesus to credits.c
2. Uncomment the #include "config.h" line in tuxmath.h to restore the
automake build.
3. Set svn:ignore for Makefile.in in new data directories (keeps svn st
output clean!)



Property changes on: tuxmath/trunk/data/images/factroids
___________________________________________________________________
Name: svn:ignore
   + Makefile.in


Modified: tuxmath/trunk/data/images/factroids/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/factroids/Makefile.in	2008-08-11 02:24:31 UTC (rev 605)
+++ tuxmath/trunk/data/images/factroids/Makefile.in	2008-08-11 15:48:50 UTC (rev 606)
@@ -238,7 +238,8 @@
 		 star3.png	 \
 		 factoroids.png  \
 		 factors.png	 \
-		 tux.png
+		 tux.png	 \
+  		 good.png
 
 all: all-am
 


Property changes on: tuxmath/trunk/data/missions/campaign
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: tuxmath/trunk/data/missions/campaign/ace
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: tuxmath/trunk/data/missions/campaign/cadet
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: tuxmath/trunk/data/missions/campaign/commando
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: tuxmath/trunk/data/missions/campaign/ranger
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: tuxmath/trunk/data/missions/campaign/scout
___________________________________________________________________
Name: svn:ignore
   + Makefile.in


Modified: tuxmath/trunk/src/credits.c
===================================================================
--- tuxmath/trunk/src/credits.c	2008-08-11 02:24:31 UTC (rev 605)
+++ tuxmath/trunk/src/credits.c	2008-08-11 15:48:50 UTC (rev 606)
@@ -52,6 +52,8 @@
   "TIM HOLY",
   "KARL OVE HUFTHAMMER",
   "AHMED SAYED",
+  "BRENDAN LUCHEN",
+  "JESUS M. MAGER H.",
   "",
   "-LEAD ARTIST",
   "SAM HART",

Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h	2008-08-11 02:24:31 UTC (rev 605)
+++ tuxmath/trunk/src/tuxmath.h	2008-08-11 15:48:50 UTC (rev 606)
@@ -24,7 +24,7 @@
 
 //To build with CMake, comment out this line so we don't include "config.h"
 //To build with Autotools, uncomment it as we must have "config.h"
-//#include "config.h"
+#include "config.h"
 
 // Translation stuff (now works for Mac and Win too!): 
 #include "gettext.h"