[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. b29445643db50de6ac45e433f731541ba09d20c7

[julio (none)]

The following commit has been merged in the master branch:
commit 7a8ed0583b8c529f07cad69c488aaf538838a6be
Author: julio <julio at julio-desktop.(none)>
Date:   Sun Dec 5 20:28:23 2010 -0600

    Some minor merge changes

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a2cc51..bfdec98 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ tuxhistory_SOURCES = tuxhistory.c \
 	SDL_rotozoom.c	\
 	scandir.c	\
 	pixels.c	\
-<<<<<<< HEAD:src/Makefile.am
 	tuxrts.c 	\
 	t4kui/ui_button.c \
 	t4kui/ui_events.c \

-- 
tuxhistory - Educational history game