Merge branch 'master' into gallium-0.2

[mesa.git] / src / mesa / swrast / s_points.h

diff --git a/src/mesa/swrast/s_points.h b/src/mesa/swrast/s_points.h
index 3fda115c0df879a8510c23d831d6ee0ce2dabfaf..a4fc53e2c010e08f036f0653f2056976e6eeff2e 100644 (file)
--- a/src/mesa/swrast/s_points.h
+++ b/src/mesa/swrast/s_points.h
@@ -27,7 +27,11 @@
 #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 );