Merge branch 'windows' of github.com:yquake2/yquake2 into windows

Conflicts:
	Makefile
	TODO
	src/windows/header/winquake.h
	src/windows/system.c
This commit is contained in:
Yamagi Burmeister 2012-06-04 14:04:11 +02:00
commit 7c41b66821

View file

@ -619,6 +619,7 @@ OPENGL_OBJS_ += \
src/windows/qgl.o src/windows/qgl.o
else else
OPENGL_OBJS_ += \ OPENGL_OBJS_ += \
src/common/shared/shared.o \
src/unix/hunk.o \ src/unix/hunk.o \
src/unix/qgl.o src/unix/qgl.o
endif endif