Merge branch 'master' into crestline
authorWang Zhenyu <zhenyu.z.wang@intel.com>
Mon, 4 Dec 2006 07:48:04 +0000 (15:48 +0800)
committerKeith Packard <keithp@neko.keithp.com>
Sat, 6 Jan 2007 23:49:23 +0000 (15:49 -0800)
commitcaf8010652f77e7687c0a3b7c267ba49d0a24d74
treeb21776131775e7ec72e5ab57c962226eaa755030
parentf34cad0f972ca838cb223429acab54d26c2f6a57
parent8c1cc5fd8084e7a927b15c88709a615fa16b06a3
Merge branch 'master' into crestline

Conflicts:

src/mesa/drivers/dri/i965/brw_tex_layout.c

Michel Dänzer replaced the copy of the 945 mipmap layout code with that from
the 945 driver directly.