ajacoutot 47f56b9a41 Fix conflicts. ... reported by naddy@ ok sthen@		2012-01-31 09:24:23 +00:00
..
patches	/dev/dri/card0 -> /dev/drm0	2011-12-20 15:00:56 +00:00
pkg	Fix conflicts.	2012-01-31 09:24:23 +00:00
distinfo	- update to 1.8.2	2011-10-17 15:49:44 +00:00
Makefile	Fix conflicts.	2012-01-31 09:24:23 +00:00