[SCM] Standalone 3D Game Maker and 3D Game Design program branch, master, updated. debian/2.6.1+dfsg-4-4-g74e93ad

[Scott Howard]

The following commit has been merged in the master branch:
commit 15dfb7e1b513178bc29c68e1c6e5f99390f6f923
Author: Scott Howard <showard314 at gmail.com>
Date:   Sat Mar 19 10:30:33 2011 -0400

    removed .rej

diff --git a/src/Makefile.rej b/src/Makefile.rej
deleted file mode 100644
index 83a9bc1..0000000
--- a/src/Makefile.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile
-+++ src/Makefile
-@@ -24,7 +24,7 @@
- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
- else
- CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
-+CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11 -lrt
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt

-- 
Standalone 3D Game Maker and 3D Game Design program