projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f34cad0 8c1cc5f)
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)
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.


Trivial merge