fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

swrast: remove merge droppings

Browse source
This commit is contained in:
Keith Whitwell 2008-09-21 11:46:36 -07:00
parent dd90d304f2
commit f9958a1ac6
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/swrast/s_points.h
View file

@ -27,11 +27,7 @@
#ifndef S_POINTS_H
#define S_POINTS_H
<<<<<<< HEAD:src/mesa/swrast/s_points.h
#include "main/mtypes.h"
=======
#include "swrast.h"
>>>>>>> master:src/mesa/swrast/s_points.h
extern void
_swrast_choose_point( GLcontext *ctx );