qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-10 14:42:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed commited CVS conflict.

Browse source
This commit is contained in:
Marcus Sundberg 2000-01-08 23:15:03 +00:00
parent 669c43509f
commit bb990403cd
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/gl_rsurf.c
View file

@ -317,7 +317,6 @@ void R_DrawSequentialPoly (msurface_t *s)
float *v;
int i;
texture_t *t;
<<<<<<< gl_rsurf.c
//
// normal lightmaped poly
@ -418,12 +417,7 @@ void R_DrawSequentialPoly (msurface_t *s)
float *v;
int i;
texture_t *t;
vec3_t nv, dir;
float ss, ss2, length;
float s1, t1;
=======
vec3_t nv;
>>>>>>> 1.5
glRect_t *theRect;
//