qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed CVS conflict.

This commit is contained in:
Marcus Sundberg 2000-01-08 22:38:53 +00:00
parent b227999f7a
commit 5001f7a5e8
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -341,13 +341,8 @@ fi
if test "x$HAS_OGL" != xyes; then
OGL_CFLAGS="" OGL_LIBS=""
else
<<<<<<< configure.in
if test "x$HAS_XMESA" = xyes; then
AC_DEFINE(XMESA,1)
=======
if test "x$HAS_XMESA" = xyes; then
AC_DEFINE(XMESA)
>>>>>>> 1.50
fi
fi