diff options
| author | Keith Whitwell <[email protected]> | 2008-09-21 11:46:36 -0700 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-21 11:46:36 -0700 |
| commit | f9958a1ac625d8608e4a8a0c0d4c9f9d108cc401 (patch) | |
| tree | 8c4755f88746c7fe77db82bbb4fba0a666a20f67 /src/mesa/swrast | |
| parent | dd90d304f2751cbd3ca9a961c8e54d37aaa47d91 (diff) | |
swrast: remove merge droppings
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_points.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_points.h b/src/mesa/swrast/s_points.h index a4fc53e2c01..9e39c601efb 100644 --- a/src/mesa/swrast/s_points.h +++ b/src/mesa/swrast/s_points.h @@ -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 ); |