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

[julio (none)]

The following commit has been merged in the master branch:
commit 6fdcb78e25d5a7b6f1e5ab737befd477ebdb7804
Merge: c18ac4a95377c3eb47135b9d3a66c4a86879478e b9166f83ba77ae19a2e1a055dd63281a86fbbabe
Author: julio <julio at julio-desktop.(none)>
Date:   Sun Dec 5 20:18:07 2010 -0600

    Merge branch 'master' of git+ssh://fongog-guest@git.debian.org/git/tux4kids/tuxhistory
    
    Conflicts:
    	configure.ac
    	src/Makefile.am

diff --combined src/Makefile.am
index bfdec98,7728813..4a2cc51
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -52,15 -52,16 +52,16 @@@ tuxhistory_SOURCES = tuxhistory.c 
  	SDL_rotozoom.c	\
  	scandir.c	\
  	pixels.c	\
 -	tuxrts.c    \
++<<<<<<< HEAD:src/Makefile.am
 +	tuxrts.c 	\
  	t4kui/ui_button.c \
  	t4kui/ui_events.c \
 -	t4kui/ui_proxywidget.c    \
 +	t4kui/ui_proxywidget.c \
  	t4kui/ui_window.c \
 -    t4kui/ui_colors.c \
 -    t4kui/ui_layouts.c    \
 -    t4kui/ui_system.c \
 -    t4kui/util.c
 -
 +	t4kui/ui_colors.c \
 +	t4kui/ui_layouts.c \
 +	t4kui/ui_system.c \
 +	t4kui/util.c
  
  # HACK "TuxHistory" is the Windows program, whereas "tuxhistory" is the Unix program
  TuxHistory_SOURCES  = $(tuxhistory_SOURCES) tuxmathrc.rc

-- 
tuxhistory - Educational history game