9 commits

Author	SHA1	Message	Date
David Dawes	2b56c96e70	Initial merge of trunk into mesa-4-0 branch.	2002-02-12 01:22:13 +00:00
Keith Whitwell	e7ce909f8f	fix PR_* definitions to match original definitions	2001-11-29 14:44:51 +00:00
Keith Whitwell	3f1341a7fb	Remove multiple states code	2001-11-29 14:24:24 +00:00
Keith Whitwell	ca7e845cc9	broken, checkpoint commit	2001-10-29 17:00:30 +00:00
David Dawes	d87c873df0	First pass of 4.1.0 merge.	2001-06-14 22:23:44 +00:00
Kevin E Martin	74e19a4018	Merged sarea-1-0-0	2001-03-14 22:22:50 +00:00
Brian Paul	7b888f87fa	applied Jeff's xf86cvs-I810copy.patch	2000-07-13 18:47:48 +00:00
Keith Whitwell	ddcb28259f	Merged mga-0-0-3-branch ... - New security model for i810 - Enable i810 dri by default - New indexed vertex path for mga - Mga kernel driver rework - Removed dead files in i810 driver	2000-05-25 21:06:02 +00:00
Jeff Hartmann	ba1b1ae380	Merged mga branch with trunk	2000-04-04 22:08:14 +00:00